Hi
Revised specs patches for gcc-4.9.x, worked fine with a gcc-4.9.0 build
which I have been using for the last 3 mths, as so far so good with 4.9.1
regards
Martin
Submitted By: Martin Ward <[email protected]>
Date: 19-06-2014
Initial Package Version: 4.9.0
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
the Pure LFS project. With contributions from William Harrington
Upstream Status: Not Applied - CLFS Specific
Description: This patch makes changes to the paths for pure64, eg 64bit libs
in /usr/lib, 32bit in /usr/lib32.
diff -Naur gcc-4.9.0.orig/gcc/config/i386/linux64.h gcc-4.9.0/gcc/config/i386/linux64.h
--- gcc-4.9.0.orig/gcc/config/i386/linux64.h 2014-06-19 07:49:57.638058019 +0000
+++ gcc-4.9.0/gcc/config/i386/linux64.h 2014-06-19 07:58:14.283109233 +0000
@@ -27,6 +27,6 @@
#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
diff -Naur gcc-4.9.0.orig/gcc/config/i386/t-linux64 gcc-4.9.0/gcc/config/i386/t-linux64
--- gcc-4.9.0.orig/gcc/config/i386/t-linux64 2014-06-19 07:49:57.635058019 +0000
+++ gcc-4.9.0/gcc/config/i386/t-linux64 2014-06-19 07:58:14.284109234 +0000
@@ -33,6 +33,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
diff -Naur gcc-4.9.0.orig/gcc/config/linux.h gcc-4.9.0/gcc/config/linux.h
--- gcc-4.9.0.orig/gcc/config/linux.h 2014-06-19 07:49:57.658058021 +0000
+++ gcc-4.9.0/gcc/config/linux.h 2014-06-19 07:58:14.284109234 +0000
@@ -74,7 +74,7 @@
GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
supporting both 32-bit and 64-bit compilation. */
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
diff -Naur gcc-4.9.0.orig/gcc/config/mips/linux64.h gcc-4.9.0/gcc/config/mips/linux64.h
--- gcc-4.9.0.orig/gcc/config/mips/linux64.h 2014-06-19 07:49:57.664058022 +0000
+++ gcc-4.9.0/gcc/config/mips/linux64.h 2014-06-19 07:58:14.284109234 +0000
@@ -23,20 +23,20 @@
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
#define GLIBC_DYNAMIC_LINKER32 \
- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
+ "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
#define GLIBC_DYNAMIC_LINKER64 \
- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
+ "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
#define GLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
+ "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
#undef UCLIBC_DYNAMIC_LINKER32
#define UCLIBC_DYNAMIC_LINKER32 \
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
+ "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
#undef UCLIBC_DYNAMIC_LINKER64
#define UCLIBC_DYNAMIC_LINKER64 \
"%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
#define UCLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
+ "%{mnan=2008:/lib64/ld-uClibc-mipsn8.so.0;:/lib64/ld-uClibc.so.0}"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
#define GNU_USER_DYNAMIC_LINKERN32 \
diff -Naur gcc-4.9.0.orig/gcc/config/mips/t-linux64 gcc-4.9.0/gcc/config/mips/t-linux64
--- gcc-4.9.0.orig/gcc/config/mips/t-linux64 2014-06-19 07:49:57.662058022 +0000
+++ gcc-4.9.0/gcc/config/mips/t-linux64 2014-06-19 07:58:14.284109234 +0000
@@ -22,5 +22,5 @@
MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
MULTILIB_OSDIRNAMES = \
../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
diff -Naur gcc-4.9.0.orig/gcc/config/rs6000/linux64.h gcc-4.9.0/gcc/config/rs6000/linux64.h
--- gcc-4.9.0.orig/gcc/config/rs6000/linux64.h 2014-06-19 07:49:57.669058022 +0000
+++ gcc-4.9.0/gcc/config/rs6000/linux64.h 2014-06-19 07:58:14.284109234 +0000
@@ -367,13 +367,13 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
#ifdef LINUX64_DEFAULT_ABI_ELFv2
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib/ld64.so.1;:/lib/ld64.so.2}"
#else
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib/ld64.so.2;:/lib/ld64.so.1}"
#endif
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
diff -Naur gcc-4.9.0.orig/gcc/config/rs6000/t-linux64 gcc-4.9.0/gcc/config/rs6000/t-linux64
--- gcc-4.9.0.orig/gcc/config/rs6000/t-linux64 2014-06-19 07:49:57.666058022 +0000
+++ gcc-4.9.0/gcc/config/rs6000/t-linux64 2014-06-19 07:58:14.285109234 +0000
@@ -28,8 +28,8 @@
MULTILIB_OPTIONS := m64/m32
MULTILIB_DIRNAMES := 64 32
MULTILIB_EXTRA_OPTS :=
-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
$(COMPILE) $<
diff -Naur gcc-4.9.0.orig/gcc/config/s390/linux.h gcc-4.9.0/gcc/config/s390/linux.h
--- gcc-4.9.0.orig/gcc/config/s390/linux.h 2014-06-19 07:49:57.630058018 +0000
+++ gcc-4.9.0/gcc/config/s390/linux.h 2014-06-19 07:58:14.285109234 +0000
@@ -60,7 +60,7 @@
#define MULTILIB_DEFAULTS { "m31" }
#endif
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
#undef LINK_SPEC
diff -Naur gcc-4.9.0.orig/gcc/config/s390/t-linux64 gcc-4.9.0/gcc/config/s390/t-linux64
--- gcc-4.9.0.orig/gcc/config/s390/t-linux64 2014-06-19 07:49:57.629058018 +0000
+++ gcc-4.9.0/gcc/config/s390/t-linux64 2014-06-19 07:58:14.285109234 +0000
@@ -7,5 +7,5 @@
MULTILIB_OPTIONS = m64/m31
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/linux.h gcc-4.9.0/gcc/config/sparc/linux.h
--- gcc-4.9.0.orig/gcc/config/sparc/linux.h 2014-06-19 07:49:57.629058018 +0000
+++ gcc-4.9.0/gcc/config/sparc/linux.h 2014-06-19 07:58:14.286109234 +0000
@@ -83,7 +83,7 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
#undef LINK_SPEC
#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/linux64.h gcc-4.9.0/gcc/config/sparc/linux64.h
--- gcc-4.9.0.orig/gcc/config/sparc/linux64.h 2014-06-19 07:49:57.629058018 +0000
+++ gcc-4.9.0/gcc/config/sparc/linux64.h 2014-06-19 07:58:14.286109234 +0000
@@ -92,8 +92,8 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
#ifdef SPARC_BI_ARCH
@@ -201,7 +201,7 @@
#else /* !SPARC_BI_ARCH */
#undef LINK_SPEC
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/t-linux64 gcc-4.9.0/gcc/config/sparc/t-linux64
--- gcc-4.9.0.orig/gcc/config/sparc/t-linux64 2014-06-19 07:49:57.628058018 +0000
+++ gcc-4.9.0/gcc/config/sparc/t-linux64 2014-06-19 07:58:14.286109234 +0000
@@ -25,5 +25,5 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
Submitted By: Martin Ward <[email protected]>
Date: 19-06-2014
Initial Package Version: 4.9.0
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
the Pure LFS project. With contributions from William Harrington
Upstream Status: Not Applied - CLFS Specific
Description: The specs patch changes the location of the dynamic linker as
well as the link spec to /tools/lib{,32,64}. This patch in
addition makes changes to the paths for pure64, eg 64bit libs
in /usr/lib, 32bit in /usr/lib32.
diff -Naur gcc-4.9.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.9.0/gcc/config/aarch64/aarch64-linux.h
--- gcc-4.9.0.orig/gcc/config/aarch64/aarch64-linux.h 2014-06-17 21:18:48.627191356 +0100
+++ gcc-4.9.0/gcc/config/aarch64/aarch64-linux.h 2014-06-17 21:46:34.148031165 +0100
@@ -21,7 +21,7 @@
#ifndef GCC_AARCH64_LINUX_H
#define GCC_AARCH64_LINUX_H
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1"
#define CPP_SPEC "%{pthread:-D_REENTRANT}"
diff -Naur gcc-4.9.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-4.9.0/gcc/config/aarch64/t-aarch64-linux
--- gcc-4.9.0.orig/gcc/config/aarch64/t-aarch64-linux 2014-06-17 21:18:48.627191356 +0100
+++ gcc-4.9.0/gcc/config/aarch64/t-aarch64-linux 2014-06-17 21:46:34.148031165 +0100
@@ -22,7 +22,7 @@
LIB1ASMFUNCS = _aarch64_sync_cache_range
AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
+MULTILIB_OSDIRNAMES = .=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
# Disable the multilib for linux-gnu targets for the time being; focus
diff -Naur gcc-4.9.0.orig/gcc/config/alpha/linux-elf.h gcc-4.9.0/gcc/config/alpha/linux-elf.h
--- gcc-4.9.0.orig/gcc/config/alpha/linux-elf.h 2014-06-17 21:18:48.641191423 +0100
+++ gcc-4.9.0/gcc/config/alpha/linux-elf.h 2014-06-17 21:46:34.148031165 +0100
@@ -23,8 +23,8 @@
#define EXTRA_SPECS \
{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.9.0.orig/gcc/config/arm/linux-eabi.h gcc-4.9.0/gcc/config/arm/linux-eabi.h
--- gcc-4.9.0.orig/gcc/config/arm/linux-eabi.h 2014-06-17 21:18:48.630191253 +0100
+++ gcc-4.9.0/gcc/config/arm/linux-eabi.h 2014-06-17 21:46:34.148031165 +0100
@@ -68,8 +68,8 @@
GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
#undef GLIBC_DYNAMIC_LINKER
-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
#define GLIBC_DYNAMIC_LINKER \
diff -Naur gcc-4.9.0.orig/gcc/config/arm/linux-elf.h gcc-4.9.0/gcc/config/arm/linux-elf.h
--- gcc-4.9.0.orig/gcc/config/arm/linux-elf.h 2014-06-17 21:18:48.633191255 +0100
+++ gcc-4.9.0/gcc/config/arm/linux-elf.h 2014-06-17 21:46:34.148947451 +0100
@@ -57,7 +57,7 @@
#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#define LINUX_TARGET_LINK_SPEC "%{h*} \
%{static:-Bstatic} \
diff -Naur gcc-4.9.0.orig/gcc/config/bfin/linux.h gcc-4.9.0/gcc/config/bfin/linux.h
--- gcc-4.9.0.orig/gcc/config/bfin/linux.h 2014-06-17 21:18:48.637191201 +0100
+++ gcc-4.9.0/gcc/config/bfin/linux.h 2014-06-17 21:46:34.148947451 +0100
@@ -45,7 +45,7 @@
%{shared:-G -Bdynamic} \
%{!shared: %{!static: \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld-uClibc.so.0} \
+ -dynamic-linker /tools/lib/ld-uClibc.so.0} \
%{static}} -init __init -fini __fini"
#undef TARGET_SUPPORTS_SYNC_CALLS
diff -Naur gcc-4.9.0.orig/gcc/config/cris/linux.h gcc-4.9.0/gcc/config/cris/linux.h
--- gcc-4.9.0.orig/gcc/config/cris/linux.h 2014-06-17 21:18:48.647191421 +0100
+++ gcc-4.9.0/gcc/config/cris/linux.h 2014-06-17 21:46:34.148947451 +0100
@@ -102,7 +102,7 @@
#undef CRIS_DEFAULT_CPU_VERSION
#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef CRIS_LINK_SUBTARGET_SPEC
#define CRIS_LINK_SUBTARGET_SPEC \
diff -Naur gcc-4.9.0.orig/gcc/config/freebsd-spec.h gcc-4.9.0/gcc/config/freebsd-spec.h
--- gcc-4.9.0.orig/gcc/config/freebsd-spec.h 2014-06-17 21:18:48.474941335 +0100
+++ gcc-4.9.0/gcc/config/freebsd-spec.h 2014-06-17 21:46:34.149954273 +0100
@@ -130,7 +130,7 @@
#if FBSD_MAJOR < 6
#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
#else
-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
#endif
/* NOTE: The freebsd-spec.h header is included also for various
diff -Naur gcc-4.9.0.orig/gcc/config/frv/linux.h gcc-4.9.0/gcc/config/frv/linux.h
--- gcc-4.9.0.orig/gcc/config/frv/linux.h 2014-06-17 21:18:48.838191306 +0100
+++ gcc-4.9.0/gcc/config/frv/linux.h 2014-06-17 21:46:34.149954273 +0100
@@ -34,7 +34,7 @@
#define ENDFILE_SPEC \
"%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.9.0.orig/gcc/config/i386/gnu.h gcc-4.9.0/gcc/config/i386/gnu.h
--- gcc-4.9.0.orig/gcc/config/i386/gnu.h 2014-06-17 21:18:48.466941478 +0100
+++ gcc-4.9.0/gcc/config/i386/gnu.h 2014-06-17 21:46:34.149954273 +0100
@@ -22,7 +22,7 @@
#define GNU_USER_LINK_EMULATION "elf_i386"
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
#undef STARTFILE_SPEC
#if defined HAVE_LD_PIE
diff -Naur gcc-4.9.0.orig/gcc/config/i386/linux.h gcc-4.9.0/gcc/config/i386/linux.h
--- gcc-4.9.0.orig/gcc/config/i386/linux.h 2014-06-17 21:18:48.473941289 +0100
+++ gcc-4.9.0/gcc/config/i386/linux.h 2014-06-17 21:46:34.149954273 +0100
@@ -20,4 +20,4 @@
<http://www.gnu.org/licenses/>. */
#define GNU_USER_LINK_EMULATION "elf_i386"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
diff -Naur gcc-4.9.0.orig/gcc/config/i386/linux64.h gcc-4.9.0/gcc/config/i386/linux64.h
--- gcc-4.9.0.orig/gcc/config/i386/linux64.h 2014-06-17 21:18:48.471941346 +0100
+++ gcc-4.9.0/gcc/config/i386/linux64.h 2014-06-17 21:46:34.150945906 +0100
@@ -27,6 +27,6 @@
#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
diff -Naur gcc-4.9.0.orig/gcc/config/i386/t-linux64 gcc-4.9.0/gcc/config/i386/t-linux64
--- gcc-4.9.0.orig/gcc/config/i386/t-linux64 2014-06-17 21:18:48.467941316 +0100
+++ gcc-4.9.0/gcc/config/i386/t-linux64 2014-06-17 21:46:34.150945906 +0100
@@ -33,6 +33,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
diff -Naur gcc-4.9.0.orig/gcc/config/ia64/linux.h gcc-4.9.0/gcc/config/ia64/linux.h
--- gcc-4.9.0.orig/gcc/config/ia64/linux.h 2014-06-17 21:18:48.638191244 +0100
+++ gcc-4.9.0/gcc/config/ia64/linux.h 2014-06-17 21:46:34.150945906 +0100
@@ -55,7 +55,7 @@
/* Define this for shared library support because it isn't in the main
linux.h file. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.9.0.orig/gcc/config/knetbsd-gnu.h gcc-4.9.0/gcc/config/knetbsd-gnu.h
--- gcc-4.9.0.orig/gcc/config/knetbsd-gnu.h 2014-06-17 21:18:48.455941245 +0100
+++ gcc-4.9.0/gcc/config/knetbsd-gnu.h 2014-06-17 21:46:34.151950499 +0100
@@ -32,4 +32,4 @@
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
diff -Naur gcc-4.9.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.9.0/gcc/config/kopensolaris-gnu.h
--- gcc-4.9.0.orig/gcc/config/kopensolaris-gnu.h 2014-06-17 21:18:48.455941245 +0100
+++ gcc-4.9.0/gcc/config/kopensolaris-gnu.h 2014-06-17 21:46:34.151950499 +0100
@@ -31,4 +31,4 @@
while (0)
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
diff -Naur gcc-4.9.0.orig/gcc/config/linux.h gcc-4.9.0/gcc/config/linux.h
--- gcc-4.9.0.orig/gcc/config/linux.h 2014-06-17 21:18:48.642191253 +0100
+++ gcc-4.9.0/gcc/config/linux.h 2014-06-17 21:46:34.151950499 +0100
@@ -73,10 +73,10 @@
GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
supporting both 32-bit and 64-bit compilation. */
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
diff -Naur gcc-4.9.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.9.0/gcc/config/lm32/uclinux-elf.h
--- gcc-4.9.0.orig/gcc/config/lm32/uclinux-elf.h 2014-06-17 21:18:48.634191243 +0100
+++ gcc-4.9.0/gcc/config/lm32/uclinux-elf.h 2014-06-17 21:46:34.152945388 +0100
@@ -67,7 +67,7 @@
%{shared:-shared} \
%{symbolic:-Bsymbolic} \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld-linux.so.2"
+ -dynamic-linker /tools/lib/ld-linux.so.2"
#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
diff -Naur gcc-4.9.0.orig/gcc/config/m68k/linux.h gcc-4.9.0/gcc/config/m68k/linux.h
--- gcc-4.9.0.orig/gcc/config/m68k/linux.h 2014-06-17 21:18:48.643191292 +0100
+++ gcc-4.9.0/gcc/config/m68k/linux.h 2014-06-17 21:46:34.152945388 +0100
@@ -71,7 +71,7 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "-m m68kelf %{shared} \
diff -Naur gcc-4.9.0.orig/gcc/config/microblaze/linux.h gcc-4.9.0/gcc/config/microblaze/linux.h
--- gcc-4.9.0.orig/gcc/config/microblaze/linux.h 2014-06-17 21:18:48.466941478 +0100
+++ gcc-4.9.0/gcc/config/microblaze/linux.h 2014-06-17 21:46:34.152945388 +0100
@@ -25,7 +25,7 @@
#undef TLS_NEEDS_GOT
#define TLS_NEEDS_GOT 1
-#define DYNAMIC_LINKER "/lib/ld.so.1"
+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "dynamic_linker", DYNAMIC_LINKER }
diff -Naur gcc-4.9.0.orig/gcc/config/mips/linux.h gcc-4.9.0/gcc/config/mips/linux.h
--- gcc-4.9.0.orig/gcc/config/mips/linux.h 2014-06-17 21:18:48.836191337 +0100
+++ gcc-4.9.0/gcc/config/mips/linux.h 2014-06-17 21:46:34.152945388 +0100
@@ -18,8 +18,8 @@
<http://www.gnu.org/licenses/>. */
#define GLIBC_DYNAMIC_LINKER \
- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
+ "%{mnan=2008:/tools/lib/ld-linux-mipsn8.so.1;:/tools/lib/ld.so.1}"
#undef UCLIBC_DYNAMIC_LINKER
#define UCLIBC_DYNAMIC_LINKER \
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
+ "%{mnan=2008:/tools/lib/ld-uClibc-mipsn8.so.0;:/tools/lib/ld-uClibc.so.0}"
diff -Naur gcc-4.9.0.orig/gcc/config/mips/linux64.h gcc-4.9.0/gcc/config/mips/linux64.h
--- gcc-4.9.0.orig/gcc/config/mips/linux64.h 2014-06-17 21:18:48.836191337 +0100
+++ gcc-4.9.0/gcc/config/mips/linux64.h 2014-06-17 21:46:34.153947459 +0100
@@ -23,20 +23,20 @@
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
#define GLIBC_DYNAMIC_LINKER32 \
- "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
+ "%{mnan=2008:/tools/lib/ld-linux-mipsn8.so.1;:/tools/lib/ld.so.1}"
#define GLIBC_DYNAMIC_LINKER64 \
- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
+ "%{mnan=2008:/tools/lib64/ld-linux-mipsn8.so.1;:/tools/lib64/ld.so.1}"
#define GLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
+ "%{mnan=2008:/tools/lib32/ld-linux-mipsn8.so.1;:/tools/lib32/ld.so.1}"
#undef UCLIBC_DYNAMIC_LINKER32
#define UCLIBC_DYNAMIC_LINKER32 \
- "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
+ "%{mnan=2008:/tools/lib/ld-uClibc-mipsn8.so.0;:/tools/lib/ld-uClibc.so.0}"
#undef UCLIBC_DYNAMIC_LINKER64
#define UCLIBC_DYNAMIC_LINKER64 \
- "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
+ "%{mnan=2008:/tools/lib/ld64-uClibc-mipsn8.so.0;:/tools/lib/ld64-uClibc.so.0}"
#define UCLIBC_DYNAMIC_LINKERN32 \
- "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
+ "%{mnan=2008:/tools/lib32/ld-uClibc-mipsn8.so.0;:/tools/lib32/ld-uClibc.so.0}"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
#define GNU_USER_DYNAMIC_LINKERN32 \
diff -Naur gcc-4.9.0.orig/gcc/config/mips/t-linux64 gcc-4.9.0/gcc/config/mips/t-linux64
--- gcc-4.9.0.orig/gcc/config/mips/t-linux64 2014-06-17 21:18:48.647191421 +0100
+++ gcc-4.9.0/gcc/config/mips/t-linux64 2014-06-17 21:46:34.153947459 +0100
@@ -22,5 +22,5 @@
MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
MULTILIB_OSDIRNAMES = \
../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
diff -Naur gcc-4.9.0.orig/gcc/config/mn10300/linux.h gcc-4.9.0/gcc/config/mn10300/linux.h
--- gcc-4.9.0.orig/gcc/config/mn10300/linux.h 2014-06-17 21:18:48.458941343 +0100
+++ gcc-4.9.0/gcc/config/mn10300/linux.h 2014-06-17 21:46:34.153947459 +0100
@@ -32,7 +32,7 @@
#undef ASM_SPEC
#define ASM_SPEC ""
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
diff -Naur gcc-4.9.0.orig/gcc/config/pa/pa-linux.h gcc-4.9.0/gcc/config/pa/pa-linux.h
--- gcc-4.9.0.orig/gcc/config/pa/pa-linux.h 2014-06-17 21:18:48.459941281 +0100
+++ gcc-4.9.0/gcc/config/pa/pa-linux.h 2014-06-17 21:46:34.154945254 +0100
@@ -40,7 +40,7 @@
/* Define this for shared library support because it isn't in the main
linux.h file. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.9.0.orig/gcc/config/rs6000/linux64.h gcc-4.9.0/gcc/config/rs6000/linux64.h
--- gcc-4.9.0.orig/gcc/config/rs6000/linux64.h 2014-06-17 21:18:48.841191338 +0100
+++ gcc-4.9.0/gcc/config/rs6000/linux64.h 2014-06-17 21:46:34.162119281 +0100
@@ -367,14 +367,14 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
#ifdef LINUX64_DEFAULT_ABI_ELFv2
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/tools/lib/ld64.so.1;:/tools/lib/ld64.so.2}"
#else
-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/tools/lib/ld64.so.2;:/tools/lib/ld64.so.1}"
#endif
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.9.0.orig/gcc/config/rs6000/sysv4.h gcc-4.9.0/gcc/config/rs6000/sysv4.h
--- gcc-4.9.0.orig/gcc/config/rs6000/sysv4.h 2014-06-17 21:18:48.839194128 +0100
+++ gcc-4.9.0/gcc/config/rs6000/sysv4.h 2014-06-17 21:46:34.162119281 +0100
@@ -761,8 +761,8 @@
#define LINK_START_LINUX_SPEC ""
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.9.0.orig/gcc/config/rs6000/t-linux64 gcc-4.9.0/gcc/config/rs6000/t-linux64
--- gcc-4.9.0.orig/gcc/config/rs6000/t-linux64 2014-06-17 21:18:48.839194128 +0100
+++ gcc-4.9.0/gcc/config/rs6000/t-linux64 2014-06-17 21:46:34.163194099 +0100
@@ -28,8 +28,8 @@
MULTILIB_OPTIONS := m64/m32
MULTILIB_DIRNAMES := 64 32
MULTILIB_EXTRA_OPTS :=
-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
$(COMPILE) $<
diff -Naur gcc-4.9.0.orig/gcc/config/s390/linux.h gcc-4.9.0/gcc/config/s390/linux.h
--- gcc-4.9.0.orig/gcc/config/s390/linux.h 2014-06-17 21:18:48.462941250 +0100
+++ gcc-4.9.0/gcc/config/s390/linux.h 2014-06-17 21:46:34.164191182 +0100
@@ -60,8 +60,8 @@
#define MULTILIB_DEFAULTS { "m31" }
#endif
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
#undef LINK_SPEC
#define LINK_SPEC \
diff -Naur gcc-4.9.0.orig/gcc/config/s390/t-linux64 gcc-4.9.0/gcc/config/s390/t-linux64
--- gcc-4.9.0.orig/gcc/config/s390/t-linux64 2014-06-17 21:18:48.461941317 +0100
+++ gcc-4.9.0/gcc/config/s390/t-linux64 2014-06-17 21:46:34.164191182 +0100
@@ -7,5 +7,5 @@
MULTILIB_OPTIONS = m64/m31
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
diff -Naur gcc-4.9.0.orig/gcc/config/sh/linux.h gcc-4.9.0/gcc/config/sh/linux.h
--- gcc-4.9.0.orig/gcc/config/sh/linux.h 2014-06-17 21:18:48.646191455 +0100
+++ gcc-4.9.0/gcc/config/sh/linux.h 2014-06-17 21:46:34.164191182 +0100
@@ -43,7 +43,7 @@
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#undef SUBTARGET_LINK_EMUL_SUFFIX
#define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/linux.h gcc-4.9.0/gcc/config/sparc/linux.h
--- gcc-4.9.0.orig/gcc/config/sparc/linux.h 2014-06-17 21:18:48.461941317 +0100
+++ gcc-4.9.0/gcc/config/sparc/linux.h 2014-06-17 21:46:34.165196443 +0100
@@ -83,7 +83,7 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#undef LINK_SPEC
#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/linux64.h gcc-4.9.0/gcc/config/sparc/linux64.h
--- gcc-4.9.0.orig/gcc/config/sparc/linux64.h 2014-06-17 21:18:48.461941317 +0100
+++ gcc-4.9.0/gcc/config/sparc/linux64.h 2014-06-17 21:46:34.165196443 +0100
@@ -92,8 +92,8 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
#ifdef SPARC_BI_ARCH
@@ -201,7 +201,7 @@
#else /* !SPARC_BI_ARCH */
#undef LINK_SPEC
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
diff -Naur gcc-4.9.0.orig/gcc/config/sparc/t-linux64 gcc-4.9.0/gcc/config/sparc/t-linux64
--- gcc-4.9.0.orig/gcc/config/sparc/t-linux64 2014-06-17 21:18:48.460941310 +0100
+++ gcc-4.9.0/gcc/config/sparc/t-linux64 2014-06-17 21:46:34.165196443 +0100
@@ -25,5 +25,5 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
diff -Naur gcc-4.9.0.orig/gcc/config/vax/linux.h gcc-4.9.0/gcc/config/vax/linux.h
--- gcc-4.9.0.orig/gcc/config/vax/linux.h 2014-06-17 21:18:48.642191253 +0100
+++ gcc-4.9.0/gcc/config/vax/linux.h 2014-06-17 21:46:34.166191153 +0100
@@ -41,7 +41,7 @@
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld.so.1} \
+ -dynamic-linker /tools/lib/ld.so.1} \
%{static:-static}}"
#undef WCHAR_TYPE
diff -Naur gcc-4.9.0.orig/gcc/config/xtensa/linux.h gcc-4.9.0/gcc/config/xtensa/linux.h
--- gcc-4.9.0.orig/gcc/config/xtensa/linux.h 2014-06-17 21:18:48.459941281 +0100
+++ gcc-4.9.0/gcc/config/xtensa/linux.h 2014-06-17 21:46:34.166191153 +0100
@@ -44,7 +44,7 @@
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls}"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC \
_______________________________________________
Clfs-dev mailing list
[email protected]
http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
