source: patches/gcc-4.8.3-pure64_specs-1.patch@ c7ce049

clfs-3.0.0-systemd systemd
Last change on this file since c7ce049 was 390c3ab, checked in by Chris Staub <chris@…>, 10 years ago

Added patches for GCC 4.8.3
  • Property mode set to 100644
File size: 22.5 KB
RevLine 
[390c3ab]1Submitted By: William Harrington <kb0iic at cross-lfs dot org>
2Date: 05-31-2014
3Initial Package Version: 4.8.3
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project, and help from
6 Martin Ward <macros_the_black@ntlworld.com>
7Upstream Status: Not Applied - CLFS Specific
8Description: The specs patch changes the location of the dynamic linker as
9 well as the link spec to /tools/lib{,32,64}. This patch in
10 addition makes changes to the paths for pure64, eg 64bit libs
11 in /usr/lib, 32bit in /usr/lib32.
12
13diff -Naur gcc-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h
14--- gcc-4.8.3.orig/gcc/config/aarch64/aarch64-linux.h 2013-08-13 13:22:18.000000000 +0000
15+++ gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h 2014-06-01 04:53:53.859803784 +0000
16@@ -21,7 +21,7 @@
17 #ifndef GCC_AARCH64_LINUX_H
18 #define GCC_AARCH64_LINUX_H
19
20-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
21+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64.so.1"
22
23 #define CPP_SPEC "%{pthread:-D_REENTRANT}"
24
25diff -Naur gcc-4.8.3.orig/gcc/config/aarch64/t-aarch64-linux gcc-4.8.3/gcc/config/aarch64/t-aarch64-linux
26--- gcc-4.8.3.orig/gcc/config/aarch64/t-aarch64-linux 2013-03-14 08:52:13.000000000 +0000
27+++ gcc-4.8.3/gcc/config/aarch64/t-aarch64-linux 2014-06-01 04:53:53.859803784 +0000
28@@ -22,4 +22,4 @@
29 LIB1ASMFUNCS = _aarch64_sync_cache_range
30
31 AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
32-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
33+MULTILIB_OSDIRNAMES = .=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
34diff -Naur gcc-4.8.3.orig/gcc/config/alpha/linux-elf.h gcc-4.8.3/gcc/config/alpha/linux-elf.h
35--- gcc-4.8.3.orig/gcc/config/alpha/linux-elf.h 2013-01-10 20:38:27.000000000 +0000
36+++ gcc-4.8.3/gcc/config/alpha/linux-elf.h 2014-06-01 04:53:53.859803784 +0000
37@@ -23,8 +23,8 @@
38 #define EXTRA_SPECS \
39 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
40
41-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
42-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
43+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
44+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
45 #if DEFAULT_LIBC == LIBC_UCLIBC
46 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
47 #elif DEFAULT_LIBC == LIBC_GLIBC
48diff -Naur gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h gcc-4.8.3/gcc/config/arm/linux-eabi.h
49--- gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h 2013-01-10 20:38:27.000000000 +0000
50+++ gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-06-01 04:53:53.859803784 +0000
51@@ -68,8 +68,8 @@
52 GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
53
54 #undef GLIBC_DYNAMIC_LINKER
55-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
56-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
57+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
58+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
59 #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
60
61 #define GLIBC_DYNAMIC_LINKER \
62diff -Naur gcc-4.8.3.orig/gcc/config/arm/linux-elf.h gcc-4.8.3/gcc/config/arm/linux-elf.h
63--- gcc-4.8.3.orig/gcc/config/arm/linux-elf.h 2013-01-10 20:38:27.000000000 +0000
64+++ gcc-4.8.3/gcc/config/arm/linux-elf.h 2014-06-01 04:53:53.859803784 +0000
65@@ -57,7 +57,7 @@
66
67 #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
68
69-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
70+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
71
72 #define LINUX_TARGET_LINK_SPEC "%{h*} \
73 %{static:-Bstatic} \
74diff -Naur gcc-4.8.3.orig/gcc/config/bfin/linux.h gcc-4.8.3/gcc/config/bfin/linux.h
75--- gcc-4.8.3.orig/gcc/config/bfin/linux.h 2013-01-10 20:38:27.000000000 +0000
76+++ gcc-4.8.3/gcc/config/bfin/linux.h 2014-06-01 04:53:53.859803784 +0000
77@@ -45,7 +45,7 @@
78 %{shared:-G -Bdynamic} \
79 %{!shared: %{!static: \
80 %{rdynamic:-export-dynamic} \
81- -dynamic-linker /lib/ld-uClibc.so.0} \
82+ -dynamic-linker /tools/lib/ld-uClibc.so.0} \
83 %{static}} -init __init -fini __fini"
84
85 #undef TARGET_SUPPORTS_SYNC_CALLS
86diff -Naur gcc-4.8.3.orig/gcc/config/cris/linux.h gcc-4.8.3/gcc/config/cris/linux.h
87--- gcc-4.8.3.orig/gcc/config/cris/linux.h 2013-01-10 20:38:27.000000000 +0000
88+++ gcc-4.8.3/gcc/config/cris/linux.h 2014-06-01 04:53:53.859803784 +0000
89@@ -102,7 +102,7 @@
90 #undef CRIS_DEFAULT_CPU_VERSION
91 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
92
93-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
94+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
95
96 #undef CRIS_LINK_SUBTARGET_SPEC
97 #define CRIS_LINK_SUBTARGET_SPEC \
98diff -Naur gcc-4.8.3.orig/gcc/config/freebsd-spec.h gcc-4.8.3/gcc/config/freebsd-spec.h
99--- gcc-4.8.3.orig/gcc/config/freebsd-spec.h 2013-01-10 20:38:27.000000000 +0000
100+++ gcc-4.8.3/gcc/config/freebsd-spec.h 2014-06-01 04:53:53.859803784 +0000
101@@ -130,7 +130,7 @@
102 #if FBSD_MAJOR < 6
103 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
104 #else
105-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
106+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
107 #endif
108
109 /* NOTE: The freebsd-spec.h header is included also for various
110diff -Naur gcc-4.8.3.orig/gcc/config/frv/linux.h gcc-4.8.3/gcc/config/frv/linux.h
111--- gcc-4.8.3.orig/gcc/config/frv/linux.h 2013-01-10 20:38:27.000000000 +0000
112+++ gcc-4.8.3/gcc/config/frv/linux.h 2014-06-01 04:53:53.859803784 +0000
113@@ -34,7 +34,7 @@
114 #define ENDFILE_SPEC \
115 "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
116
117-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
118+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
119
120 #undef LINK_SPEC
121 #define LINK_SPEC "\
122diff -Naur gcc-4.8.3.orig/gcc/config/i386/gnu.h gcc-4.8.3/gcc/config/i386/gnu.h
123--- gcc-4.8.3.orig/gcc/config/i386/gnu.h 2013-01-10 20:38:27.000000000 +0000
124+++ gcc-4.8.3/gcc/config/i386/gnu.h 2014-06-01 04:53:53.859803784 +0000
125@@ -22,7 +22,7 @@
126 #define GNU_USER_LINK_EMULATION "elf_i386"
127
128 #undef GNU_USER_DYNAMIC_LINKER
129-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
130+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
131
132 #undef STARTFILE_SPEC
133 #if defined HAVE_LD_PIE
134diff -Naur gcc-4.8.3.orig/gcc/config/i386/linux.h gcc-4.8.3/gcc/config/i386/linux.h
135--- gcc-4.8.3.orig/gcc/config/i386/linux.h 2013-01-10 20:38:27.000000000 +0000
136+++ gcc-4.8.3/gcc/config/i386/linux.h 2014-06-01 04:53:53.859803784 +0000
137@@ -20,4 +20,4 @@
138 <http://www.gnu.org/licenses/>. */
139
140 #define GNU_USER_LINK_EMULATION "elf_i386"
141-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
142+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
143diff -Naur gcc-4.8.3.orig/gcc/config/i386/linux64.h gcc-4.8.3/gcc/config/i386/linux64.h
144--- gcc-4.8.3.orig/gcc/config/i386/linux64.h 2013-01-10 20:38:27.000000000 +0000
145+++ gcc-4.8.3/gcc/config/i386/linux64.h 2014-06-01 04:53:53.859803784 +0000
146@@ -27,6 +27,6 @@
147 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
148 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
149
150-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
151-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
152-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
153+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
154+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
155+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
156diff -Naur gcc-4.8.3.orig/gcc/config/i386/t-linux64 gcc-4.8.3/gcc/config/i386/t-linux64
157--- gcc-4.8.3.orig/gcc/config/i386/t-linux64 2013-01-10 20:38:27.000000000 +0000
158+++ gcc-4.8.3/gcc/config/i386/t-linux64 2014-06-01 04:53:53.859803784 +0000
159@@ -33,6 +33,6 @@
160 comma=,
161 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
162 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
163-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
164-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
165+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
166+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
167 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
168diff -Naur gcc-4.8.3.orig/gcc/config/ia64/linux.h gcc-4.8.3/gcc/config/ia64/linux.h
169--- gcc-4.8.3.orig/gcc/config/ia64/linux.h 2013-01-10 20:38:27.000000000 +0000
170+++ gcc-4.8.3/gcc/config/ia64/linux.h 2014-06-01 04:53:53.859803784 +0000
171@@ -55,7 +55,7 @@
172 /* Define this for shared library support because it isn't in the main
173 linux.h file. */
174
175-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
176+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
177
178 #undef LINK_SPEC
179 #define LINK_SPEC "\
180diff -Naur gcc-4.8.3.orig/gcc/config/knetbsd-gnu.h gcc-4.8.3/gcc/config/knetbsd-gnu.h
181--- gcc-4.8.3.orig/gcc/config/knetbsd-gnu.h 2013-01-10 20:38:27.000000000 +0000
182+++ gcc-4.8.3/gcc/config/knetbsd-gnu.h 2014-06-01 04:53:53.859803784 +0000
183@@ -32,4 +32,4 @@
184
185
186 #undef GNU_USER_DYNAMIC_LINKER
187-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
188+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
189diff -Naur gcc-4.8.3.orig/gcc/config/kopensolaris-gnu.h gcc-4.8.3/gcc/config/kopensolaris-gnu.h
190--- gcc-4.8.3.orig/gcc/config/kopensolaris-gnu.h 2013-01-10 20:38:27.000000000 +0000
191+++ gcc-4.8.3/gcc/config/kopensolaris-gnu.h 2014-06-01 04:53:53.859803784 +0000
192@@ -31,4 +31,4 @@
193 while (0)
194
195 #undef GNU_USER_DYNAMIC_LINKER
196-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
197+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
198diff -Naur gcc-4.8.3.orig/gcc/config/linux.h gcc-4.8.3/gcc/config/linux.h
199--- gcc-4.8.3.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000
200+++ gcc-4.8.3/gcc/config/linux.h 2014-06-01 04:53:53.859803784 +0000
201@@ -73,10 +73,10 @@
202 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
203 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
204 supporting both 32-bit and 64-bit compilation. */
205-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
206-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
207-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
208-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
209+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
210+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
211+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
212+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
213 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
214 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
215 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
216diff -Naur gcc-4.8.3.orig/gcc/config/lm32/uclinux-elf.h gcc-4.8.3/gcc/config/lm32/uclinux-elf.h
217--- gcc-4.8.3.orig/gcc/config/lm32/uclinux-elf.h 2013-01-10 20:38:27.000000000 +0000
218+++ gcc-4.8.3/gcc/config/lm32/uclinux-elf.h 2014-06-01 04:53:53.859803784 +0000
219@@ -67,7 +67,7 @@
220 %{shared:-shared} \
221 %{symbolic:-Bsymbolic} \
222 %{rdynamic:-export-dynamic} \
223- -dynamic-linker /lib/ld-linux.so.2"
224+ -dynamic-linker /tools/lib/ld-linux.so.2"
225
226 #define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
227
228diff -Naur gcc-4.8.3.orig/gcc/config/m68k/linux.h gcc-4.8.3/gcc/config/m68k/linux.h
229--- gcc-4.8.3.orig/gcc/config/m68k/linux.h 2013-01-10 20:38:27.000000000 +0000
230+++ gcc-4.8.3/gcc/config/m68k/linux.h 2014-06-01 04:53:53.859803784 +0000
231@@ -71,7 +71,7 @@
232 When the -shared link option is used a final link is not being
233 done. */
234
235-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
236+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
237
238 #undef LINK_SPEC
239 #define LINK_SPEC "-m m68kelf %{shared} \
240diff -Naur gcc-4.8.3.orig/gcc/config/microblaze/linux.h gcc-4.8.3/gcc/config/microblaze/linux.h
241--- gcc-4.8.3.orig/gcc/config/microblaze/linux.h 2013-03-14 15:43:23.000000000 +0000
242+++ gcc-4.8.3/gcc/config/microblaze/linux.h 2014-06-01 04:53:53.859803784 +0000
243@@ -25,7 +25,7 @@
244 #undef TLS_NEEDS_GOT
245 #define TLS_NEEDS_GOT 1
246
247-#define DYNAMIC_LINKER "/lib/ld.so.1"
248+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
249 #undef SUBTARGET_EXTRA_SPECS
250 #define SUBTARGET_EXTRA_SPECS \
251 { "dynamic_linker", DYNAMIC_LINKER }
252diff -Naur gcc-4.8.3.orig/gcc/config/mips/linux.h gcc-4.8.3/gcc/config/mips/linux.h
253--- gcc-4.8.3.orig/gcc/config/mips/linux.h 2013-01-10 20:38:27.000000000 +0000
254+++ gcc-4.8.3/gcc/config/mips/linux.h 2014-06-01 04:53:53.859803784 +0000
255@@ -17,4 +17,4 @@
256 along with GCC; see the file COPYING3. If not see
257 <http://www.gnu.org/licenses/>. */
258
259-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
260+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
261diff -Naur gcc-4.8.3.orig/gcc/config/mips/linux64.h gcc-4.8.3/gcc/config/mips/linux64.h
262--- gcc-4.8.3.orig/gcc/config/mips/linux64.h 2013-01-10 20:38:27.000000000 +0000
263+++ gcc-4.8.3/gcc/config/mips/linux64.h 2014-06-01 04:53:53.859803784 +0000
264@@ -22,10 +22,10 @@
265 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
266 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
267
268-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
269-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
270-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
271-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
272+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
273+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
274+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
275+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
276 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
277 #define GNU_USER_DYNAMIC_LINKERN32 \
278 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
279diff -Naur gcc-4.8.3.orig/gcc/config/mips/t-linux64 gcc-4.8.3/gcc/config/mips/t-linux64
280--- gcc-4.8.3.orig/gcc/config/mips/t-linux64 2013-01-10 20:38:27.000000000 +0000
281+++ gcc-4.8.3/gcc/config/mips/t-linux64 2014-06-01 04:53:53.863137492 +0000
282@@ -22,5 +22,5 @@
283 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
284 MULTILIB_OSDIRNAMES = \
285 ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
286- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
287- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
288+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
289+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
290diff -Naur gcc-4.8.3.orig/gcc/config/mn10300/linux.h gcc-4.8.3/gcc/config/mn10300/linux.h
291--- gcc-4.8.3.orig/gcc/config/mn10300/linux.h 2013-01-10 20:38:27.000000000 +0000
292+++ gcc-4.8.3/gcc/config/mn10300/linux.h 2014-06-01 04:53:53.863137492 +0000
293@@ -32,7 +32,7 @@
294 #undef ASM_SPEC
295 #define ASM_SPEC ""
296
297-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
298+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
299
300 #undef LINK_SPEC
301 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
302diff -Naur gcc-4.8.3.orig/gcc/config/pa/pa-linux.h gcc-4.8.3/gcc/config/pa/pa-linux.h
303--- gcc-4.8.3.orig/gcc/config/pa/pa-linux.h 2013-01-10 20:38:27.000000000 +0000
304+++ gcc-4.8.3/gcc/config/pa/pa-linux.h 2014-06-01 04:53:53.863137492 +0000
305@@ -37,7 +37,7 @@
306 /* Define this for shared library support because it isn't in the main
307 linux.h file. */
308
309-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
310+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
311
312 #undef LINK_SPEC
313 #define LINK_SPEC "\
314diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/linux64.h gcc-4.8.3/gcc/config/rs6000/linux64.h
315--- gcc-4.8.3.orig/gcc/config/rs6000/linux64.h 2014-04-04 15:10:24.000000000 +0000
316+++ gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-06-01 04:56:50.147831773 +0000
317@@ -366,14 +366,14 @@
318 #undef LINK_OS_DEFAULT_SPEC
319 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
320
321-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
322+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
323 #ifdef LINUX64_DEFAULT_ABI_ELFv2
324-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
325+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/tools/lib/ld64.so.1;:/tools/lib/ld64.so.2}"
326 #else
327-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
328+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/tools/lib/ld64.so.2;:/tools/lib/ld64.so.1}"
329 #endif
330-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
331-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
332+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
333+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
334 #if DEFAULT_LIBC == LIBC_UCLIBC
335 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
336 #elif DEFAULT_LIBC == LIBC_GLIBC
337diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h gcc-4.8.3/gcc/config/rs6000/sysv4.h
338--- gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h 2014-04-04 14:50:31.000000000 +0000
339+++ gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-06-01 04:53:53.863137492 +0000
340@@ -761,8 +761,8 @@
341
342 #define LINK_START_LINUX_SPEC ""
343
344-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
345-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
346+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
347+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
348 #if DEFAULT_LIBC == LIBC_UCLIBC
349 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
350 #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
351diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/t-linux64 gcc-4.8.3/gcc/config/rs6000/t-linux64
352--- gcc-4.8.3.orig/gcc/config/rs6000/t-linux64 2014-04-04 14:39:26.000000000 +0000
353+++ gcc-4.8.3/gcc/config/rs6000/t-linux64 2014-06-01 05:00:41.310584131 +0000
354@@ -28,5 +28,5 @@
355 MULTILIB_OPTIONS := m64/m32
356 MULTILIB_DIRNAMES := 64 32
357 MULTILIB_EXTRA_OPTS :=
358-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
359-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
360+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
361+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
362diff -Naur gcc-4.8.3.orig/gcc/config/s390/linux.h gcc-4.8.3/gcc/config/s390/linux.h
363--- gcc-4.8.3.orig/gcc/config/s390/linux.h 2013-01-10 20:38:27.000000000 +0000
364+++ gcc-4.8.3/gcc/config/s390/linux.h 2014-06-01 04:53:53.863137492 +0000
365@@ -60,8 +60,8 @@
366 #define MULTILIB_DEFAULTS { "m31" }
367 #endif
368
369-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
370-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
371+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
372+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
373
374 #undef LINK_SPEC
375 #define LINK_SPEC \
376diff -Naur gcc-4.8.3.orig/gcc/config/s390/t-linux64 gcc-4.8.3/gcc/config/s390/t-linux64
377--- gcc-4.8.3.orig/gcc/config/s390/t-linux64 2012-11-21 16:13:28.000000000 +0000
378+++ gcc-4.8.3/gcc/config/s390/t-linux64 2014-06-01 04:53:53.863137492 +0000
379@@ -7,5 +7,5 @@
380
381 MULTILIB_OPTIONS = m64/m31
382 MULTILIB_DIRNAMES = 64 32
383-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
384-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
385+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
386+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
387diff -Naur gcc-4.8.3.orig/gcc/config/sh/linux.h gcc-4.8.3/gcc/config/sh/linux.h
388--- gcc-4.8.3.orig/gcc/config/sh/linux.h 2013-03-14 03:01:53.000000000 +0000
389+++ gcc-4.8.3/gcc/config/sh/linux.h 2014-06-01 04:53:53.863137492 +0000
390@@ -43,7 +43,7 @@
391
392 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
393
394-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
395+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
396
397 #undef SUBTARGET_LINK_EMUL_SUFFIX
398 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
399diff -Naur gcc-4.8.3.orig/gcc/config/sparc/linux.h gcc-4.8.3/gcc/config/sparc/linux.h
400--- gcc-4.8.3.orig/gcc/config/sparc/linux.h 2013-01-10 20:38:27.000000000 +0000
401+++ gcc-4.8.3/gcc/config/sparc/linux.h 2014-06-01 04:53:53.863137492 +0000
402@@ -83,7 +83,7 @@
403 When the -shared link option is used a final link is not being
404 done. */
405
406-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
407+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
408
409 #undef LINK_SPEC
410 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
411diff -Naur gcc-4.8.3.orig/gcc/config/sparc/linux64.h gcc-4.8.3/gcc/config/sparc/linux64.h
412--- gcc-4.8.3.orig/gcc/config/sparc/linux64.h 2013-01-10 20:38:27.000000000 +0000
413+++ gcc-4.8.3/gcc/config/sparc/linux64.h 2014-06-01 04:53:53.863137492 +0000
414@@ -92,8 +92,8 @@
415 When the -shared link option is used a final link is not being
416 done. */
417
418-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
419-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
420+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
421+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
422
423 #ifdef SPARC_BI_ARCH
424
425@@ -201,7 +201,7 @@
426 #else /* !SPARC_BI_ARCH */
427
428 #undef LINK_SPEC
429-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
430+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
431 %{!shared: \
432 %{!static: \
433 %{rdynamic:-export-dynamic} \
434diff -Naur gcc-4.8.3.orig/gcc/config/sparc/t-linux64 gcc-4.8.3/gcc/config/sparc/t-linux64
435--- gcc-4.8.3.orig/gcc/config/sparc/t-linux64 2013-01-10 20:38:27.000000000 +0000
436+++ gcc-4.8.3/gcc/config/sparc/t-linux64 2014-06-01 04:53:53.863137492 +0000
437@@ -25,5 +25,5 @@
438
439 MULTILIB_OPTIONS = m64/m32
440 MULTILIB_DIRNAMES = 64 32
441-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
442-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
443+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
444+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
445diff -Naur gcc-4.8.3.orig/gcc/config/vax/linux.h gcc-4.8.3/gcc/config/vax/linux.h
446--- gcc-4.8.3.orig/gcc/config/vax/linux.h 2013-01-10 20:38:27.000000000 +0000
447+++ gcc-4.8.3/gcc/config/vax/linux.h 2014-06-01 04:53:53.863137492 +0000
448@@ -41,7 +41,7 @@
449 %{!shared: \
450 %{!static: \
451 %{rdynamic:-export-dynamic} \
452- -dynamic-linker /lib/ld.so.1} \
453+ -dynamic-linker /tools/lib/ld.so.1} \
454 %{static:-static}}"
455
456 #undef WCHAR_TYPE
457diff -Naur gcc-4.8.3.orig/gcc/config/xtensa/linux.h gcc-4.8.3/gcc/config/xtensa/linux.h
458--- gcc-4.8.3.orig/gcc/config/xtensa/linux.h 2013-01-10 20:38:27.000000000 +0000
459+++ gcc-4.8.3/gcc/config/xtensa/linux.h 2014-06-01 04:53:53.863137492 +0000
460@@ -44,7 +44,7 @@
461 %{mlongcalls:--longcalls} \
462 %{mno-longcalls:--no-longcalls}"
463
464-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
465+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
466
467 #undef LINK_SPEC
468 #define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.