source: patches/gcc-4.5.0-pure64_specs-1.patch@ d6416dd

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since d6416dd was c0595573, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated GCC to 4.5.0, This commit is not complete, Doing a partial commit to add new dependencies and fix broken ones for gcc.
  • Property mode set to 100644
File size: 21.2 KB
RevLine 
[c0595573]1Submitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 07-25-2010
3Initial Package Version: 3.4.6
[9722468]4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project.
[c0595573]6Upstream Status: Not Applied - CLFS Specific
7Description: The specs patch changes the location of the dynamic linker as
8 well as the link spec to /tools/lib{,32,64}. This patch in
9 addition makes changes to the paths for pure64, eg 64bit libs
10 in /usr/lib, 32bit in /usr/lib32.
[9722468]11
[c0595573]12diff -Naur gcc-4.5.0.orig/gcc/config/alpha/gnu.h gcc-4.5.0/gcc/config/alpha/gnu.h
13--- gcc-4.5.0.orig/gcc/config/alpha/gnu.h 2009-04-21 15:03:23.000000000 -0400
14+++ gcc-4.5.0/gcc/config/alpha/gnu.h 2010-07-25 16:12:35.229577160 -0400
15@@ -34,7 +34,7 @@
[9722468]16 } while (0)
17
18 #undef ELF_DYNAMIC_LINKER
19-#define ELF_DYNAMIC_LINKER "/lib/ld.so"
20+#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so"
21
22 #undef STARTFILE_SPEC
23 #define STARTFILE_SPEC \
[c0595573]24diff -Naur gcc-4.5.0.orig/gcc/config/alpha/linux-elf.h gcc-4.5.0/gcc/config/alpha/linux-elf.h
25--- gcc-4.5.0.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -0400
26+++ gcc-4.5.0/gcc/config/alpha/linux-elf.h 2010-07-25 16:12:35.225576640 -0400
[9722468]27@@ -27,8 +27,8 @@
28 #define EXTRA_SPECS \
29 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
30
31-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
32-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
33+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
34+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
35 #if UCLIBC_DEFAULT
36 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
37 #else
[c0595573]38diff -Naur gcc-4.5.0.orig/gcc/config/arm/linux-eabi.h gcc-4.5.0/gcc/config/arm/linux-eabi.h
39--- gcc-4.5.0.orig/gcc/config/arm/linux-eabi.h 2009-10-30 16:03:09.000000000 -0400
40+++ gcc-4.5.0/gcc/config/arm/linux-eabi.h 2010-07-25 16:12:35.245577118 -0400
[9722468]41@@ -61,7 +61,7 @@
42 /* Use ld-linux.so.3 so that it will be possible to run "classic"
43 GNU/Linux binaries on an EABI system. */
44 #undef GLIBC_DYNAMIC_LINKER
45-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
46+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
47
48 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
49 use the GNU/Linux version, not the generic BPABI version. */
[c0595573]50diff -Naur gcc-4.5.0.orig/gcc/config/arm/linux-elf.h gcc-4.5.0/gcc/config/arm/linux-elf.h
51--- gcc-4.5.0.orig/gcc/config/arm/linux-elf.h 2009-11-05 09:47:45.000000000 -0500
52+++ gcc-4.5.0/gcc/config/arm/linux-elf.h 2010-07-25 16:12:35.245577118 -0400
[9722468]53@@ -62,7 +62,7 @@
54
55 #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
56
57-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
58+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
59
60 #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
61 %{b} \
[c0595573]62diff -Naur gcc-4.5.0.orig/gcc/config/bfin/linux.h gcc-4.5.0/gcc/config/bfin/linux.h
63--- gcc-4.5.0.orig/gcc/config/bfin/linux.h 2009-09-03 11:37:28.000000000 -0400
64+++ gcc-4.5.0/gcc/config/bfin/linux.h 2010-07-25 16:12:35.049578096 -0400
65@@ -45,7 +45,7 @@
[9722468]66 %{shared:-G -Bdynamic} \
67 %{!shared: %{!static: \
68 %{rdynamic:-export-dynamic} \
69- %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
70+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
71 %{static}} -init __init -fini __fini"
72
73 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
[c0595573]74diff -Naur gcc-4.5.0.orig/gcc/config/cris/linux.h gcc-4.5.0/gcc/config/cris/linux.h
75--- gcc-4.5.0.orig/gcc/config/cris/linux.h 2009-03-22 11:15:04.000000000 -0400
76+++ gcc-4.5.0/gcc/config/cris/linux.h 2010-07-25 16:12:35.289576639 -0400
[9722468]77@@ -103,7 +103,7 @@
78 #undef CRIS_DEFAULT_CPU_VERSION
79 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
80
81-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
82+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
83
84 /* We need an -rpath-link to ld.so.1, and presumably to each directory
85 specified with -B. */
[c0595573]86diff -Naur gcc-4.5.0.orig/gcc/config/freebsd-spec.h gcc-4.5.0/gcc/config/freebsd-spec.h
87--- gcc-4.5.0.orig/gcc/config/freebsd-spec.h 2009-09-22 12:28:26.000000000 -0400
88+++ gcc-4.5.0/gcc/config/freebsd-spec.h 2010-07-25 16:12:35.361577332 -0400
89@@ -146,7 +146,7 @@
90 #if FBSD_MAJOR < 6
91 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
92 #else
93-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
94+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
95 #endif
96
97 #if defined(HAVE_LD_EH_FRAME_HDR)
98diff -Naur gcc-4.5.0.orig/gcc/config/frv/linux.h gcc-4.5.0/gcc/config/frv/linux.h
99--- gcc-4.5.0.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -0400
100+++ gcc-4.5.0/gcc/config/frv/linux.h 2010-07-25 16:12:35.205578493 -0400
[9722468]101@@ -35,7 +35,7 @@
102 #define ENDFILE_SPEC \
103 "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
104
105-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
106+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
107
108 #undef LINK_SPEC
109 #define LINK_SPEC "\
[c0595573]110diff -Naur gcc-4.5.0.orig/gcc/config/i386/gnu.h gcc-4.5.0/gcc/config/i386/gnu.h
111--- gcc-4.5.0.orig/gcc/config/i386/gnu.h 2008-11-13 18:28:46.000000000 -0500
112+++ gcc-4.5.0/gcc/config/i386/gnu.h 2010-07-25 16:12:35.317577305 -0400
[9722468]113@@ -21,7 +21,7 @@
114 */
115
116 #undef GLIBC_DYNAMIC_LINKER
117-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
118+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
119
120 #undef TARGET_VERSION
121 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
[c0595573]122diff -Naur gcc-4.5.0.orig/gcc/config/i386/linux.h gcc-4.5.0/gcc/config/i386/linux.h
123--- gcc-4.5.0.orig/gcc/config/i386/linux.h 2010-03-24 16:44:48.000000000 -0400
124+++ gcc-4.5.0/gcc/config/i386/linux.h 2010-07-25 16:12:35.305577262 -0400
[9722468]125@@ -100,7 +100,7 @@
126
127 /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
128 #define LINK_EMULATION "elf_i386"
129-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
130+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
131
132 #undef ASM_SPEC
133 #define ASM_SPEC \
[c0595573]134diff -Naur gcc-4.5.0.orig/gcc/config/i386/linux64.h gcc-4.5.0/gcc/config/i386/linux64.h
135--- gcc-4.5.0.orig/gcc/config/i386/linux64.h 2010-03-24 16:44:48.000000000 -0400
136+++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-07-25 16:12:35.325577625 -0400
137@@ -58,8 +58,8 @@
138 When the -shared link option is used a final link is not being
139 done. */
140
141-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
142-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
143+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
144+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
145
146 #if TARGET_64BIT_DEFAULT
147 #define SPEC_32 "m32"
148diff -Naur gcc-4.5.0.orig/gcc/config/i386/t-linux64 gcc-4.5.0/gcc/config/i386/t-linux64
149--- gcc-4.5.0.orig/gcc/config/i386/t-linux64 2009-04-21 15:03:23.000000000 -0400
150+++ gcc-4.5.0/gcc/config/i386/t-linux64 2010-07-25 16:15:29.253827449 -0400
151@@ -25,7 +25,7 @@
[9722468]152
153 MULTILIB_OPTIONS = m64/m32
154 MULTILIB_DIRNAMES = 64 32
155-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
[c0595573]156+MULTILIB_OSDIRNAMES = ../lib ../lib32
[9722468]157
158 LIBGCC = stmp-multilib
159 INSTALL_LIBGCC = install-multilib
[c0595573]160diff -Naur gcc-4.5.0.orig/gcc/config/ia64/linux.h gcc-4.5.0/gcc/config/ia64/linux.h
161--- gcc-4.5.0.orig/gcc/config/ia64/linux.h 2009-04-21 15:03:23.000000000 -0400
162+++ gcc-4.5.0/gcc/config/ia64/linux.h 2010-07-25 16:12:35.185577234 -0400
163@@ -61,7 +61,7 @@
[9722468]164 /* Define this for shared library support because it isn't in the main
165 linux.h file. */
166
167-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
168+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
169
170 #undef LINK_SPEC
171 #define LINK_SPEC "\
[c0595573]172diff -Naur gcc-4.5.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.5.0/gcc/config/kfreebsd-gnu.h
173--- gcc-4.5.0.orig/gcc/config/kfreebsd-gnu.h 2007-08-02 06:49:31.000000000 -0400
174+++ gcc-4.5.0/gcc/config/kfreebsd-gnu.h 2010-07-25 16:12:35.333583583 -0400
175@@ -33,5 +33,5 @@
176
177 #ifdef GLIBC_DYNAMIC_LINKER
178 #undef GLIBC_DYNAMIC_LINKER
179-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
180+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
181 #endif
182diff -Naur gcc-4.5.0.orig/gcc/config/knetbsd-gnu.h gcc-4.5.0/gcc/config/knetbsd-gnu.h
183--- gcc-4.5.0.orig/gcc/config/knetbsd-gnu.h 2007-08-02 06:49:31.000000000 -0400
184+++ gcc-4.5.0/gcc/config/knetbsd-gnu.h 2010-07-25 16:12:35.045577979 -0400
185@@ -34,5 +34,5 @@
186
187 #ifdef GLIBC_DYNAMIC_LINKER
188 #undef GLIBC_DYNAMIC_LINKER
189-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
190+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
191 #endif
192diff -Naur gcc-4.5.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.5.0/gcc/config/kopensolaris-gnu.h
193--- gcc-4.5.0.orig/gcc/config/kopensolaris-gnu.h 2009-01-29 13:48:41.000000000 -0500
194+++ gcc-4.5.0/gcc/config/kopensolaris-gnu.h 2010-07-25 16:12:35.073577415 -0400
[9722468]195@@ -33,5 +33,5 @@
196
197 #ifdef GLIBC_DYNAMIC_LINKER
198 #undef GLIBC_DYNAMIC_LINKER
199-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
200+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
201 #endif
[c0595573]202diff -Naur gcc-4.5.0.orig/gcc/config/linux.h gcc-4.5.0/gcc/config/linux.h
203--- gcc-4.5.0.orig/gcc/config/linux.h 2009-04-09 11:00:19.000000000 -0400
204+++ gcc-4.5.0/gcc/config/linux.h 2010-07-25 16:12:35.081581396 -0400
[9722468]205@@ -117,9 +117,9 @@
206 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
207 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
208 supporting both 32-bit and 64-bit compilation. */
209-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
210-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
211-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
212+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
213+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
214+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
215 #define LINUX_DYNAMIC_LINKER \
216 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
217 #define LINUX_DYNAMIC_LINKER32 \
[c0595573]218diff -Naur gcc-4.5.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.5.0/gcc/config/lm32/uclinux-elf.h
219--- gcc-4.5.0.orig/gcc/config/lm32/uclinux-elf.h 2009-11-11 11:43:06.000000000 -0500
220+++ gcc-4.5.0/gcc/config/lm32/uclinux-elf.h 2010-07-25 16:12:35.285576706 -0400
221@@ -73,7 +73,7 @@
222 %{shared:-shared} \
223 %{symbolic:-Bsymbolic} \
224 %{rdynamic:-export-dynamic} \
225- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}"
226+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}"
227
228 #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
229
230diff -Naur gcc-4.5.0.orig/gcc/config/m32r/linux.h gcc-4.5.0/gcc/config/m32r/linux.h
231--- gcc-4.5.0.orig/gcc/config/m32r/linux.h 2007-08-02 06:49:31.000000000 -0400
232+++ gcc-4.5.0/gcc/config/m32r/linux.h 2010-07-25 16:12:35.065578524 -0400
[9722468]233@@ -58,7 +58,7 @@
234
235 /* If ELF is the default format, we should not use /lib/elf. */
236
237-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
238+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
239
240 #undef LINK_SPEC
241 #if TARGET_LITTLE_ENDIAN
[c0595573]242diff -Naur gcc-4.5.0.orig/gcc/config/m68k/linux.h gcc-4.5.0/gcc/config/m68k/linux.h
243--- gcc-4.5.0.orig/gcc/config/m68k/linux.h 2009-12-11 10:32:08.000000000 -0500
244+++ gcc-4.5.0/gcc/config/m68k/linux.h 2010-07-25 16:12:35.145576353 -0400
[9722468]245@@ -84,7 +84,7 @@
246
247 /* If ELF is the default format, we should not use /lib/elf. */
248
249-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
250+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
251
252 #undef LINK_SPEC
253 #define LINK_SPEC "-m m68kelf %{shared} \
[c0595573]254diff -Naur gcc-4.5.0.orig/gcc/config/mips/linux.h gcc-4.5.0/gcc/config/mips/linux.h
255--- gcc-4.5.0.orig/gcc/config/mips/linux.h 2009-02-20 10:20:38.000000000 -0500
256+++ gcc-4.5.0/gcc/config/mips/linux.h 2010-07-25 16:12:35.089577491 -0400
257@@ -64,7 +64,7 @@
258 #undef MIPS_DEFAULT_GVALUE
259 #define MIPS_DEFAULT_GVALUE 0
260
261-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
262+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
263
264 /* Borrowed from sparc/linux.h */
265 #undef LINK_SPEC
266diff -Naur gcc-4.5.0.orig/gcc/config/mips/linux64.h gcc-4.5.0/gcc/config/mips/linux64.h
267--- gcc-4.5.0.orig/gcc/config/mips/linux64.h 2009-02-20 10:20:38.000000000 -0500
268+++ gcc-4.5.0/gcc/config/mips/linux64.h 2010-07-25 16:12:35.113577273 -0400
[9722468]269@@ -35,10 +35,10 @@
270 %{!shared: \
271 %{profile:-lc_p} %{!profile:-lc}}"
272
273-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
274-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
275-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
276-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
277+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
278+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
279+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
280+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
281 #define LINUX_DYNAMIC_LINKERN32 \
282 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
283
[c0595573]284diff -Naur gcc-4.5.0.orig/gcc/config/mips/t-linux64 gcc-4.5.0/gcc/config/mips/t-linux64
285--- gcc-4.5.0.orig/gcc/config/mips/t-linux64 2009-04-21 15:03:23.000000000 -0400
286+++ gcc-4.5.0/gcc/config/mips/t-linux64 2010-07-25 16:14:09.345576578 -0400
287@@ -18,7 +18,7 @@
[9722468]288
289 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
290 MULTILIB_DIRNAMES = n32 32 64
291-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
292+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
293
294 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
295
[c0595573]296diff -Naur gcc-4.5.0.orig/gcc/config/mn10300/linux.h gcc-4.5.0/gcc/config/mn10300/linux.h
297--- gcc-4.5.0.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400
298+++ gcc-4.5.0/gcc/config/mn10300/linux.h 2010-07-25 16:12:35.153580072 -0400
[9722468]299@@ -32,7 +32,7 @@
300 #undef ASM_SPEC
301 #define ASM_SPEC "%{Wa,*:%*}"
302
303-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
304+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
305
306 #undef LINK_SPEC
307 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
[c0595573]308diff -Naur gcc-4.5.0.orig/gcc/config/pa/pa-linux.h gcc-4.5.0/gcc/config/pa/pa-linux.h
309--- gcc-4.5.0.orig/gcc/config/pa/pa-linux.h 2009-12-04 02:47:51.000000000 -0500
310+++ gcc-4.5.0/gcc/config/pa/pa-linux.h 2010-07-25 16:12:35.269577363 -0400
311@@ -38,7 +38,7 @@
[9722468]312 /* Define this for shared library support because it isn't in the main
313 linux.h file. */
314
315-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
316+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
317
318 #undef LINK_SPEC
319 #define LINK_SPEC "\
[c0595573]320diff -Naur gcc-4.5.0.orig/gcc/config/rs6000/linux64.h gcc-4.5.0/gcc/config/rs6000/linux64.h
321--- gcc-4.5.0.orig/gcc/config/rs6000/linux64.h 2010-03-17 00:44:37.000000000 -0400
322+++ gcc-4.5.0/gcc/config/rs6000/linux64.h 2010-07-25 16:12:35.129577292 -0400
323@@ -348,10 +348,10 @@
[9722468]324 #undef LINK_OS_DEFAULT_SPEC
325 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
326
327-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
328-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
329-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
330-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
331+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
332+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
333+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
334+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
335 #if UCLIBC_DEFAULT
336 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
337 #else
[c0595573]338diff -Naur gcc-4.5.0.orig/gcc/config/rs6000/sysv4.h gcc-4.5.0/gcc/config/rs6000/sysv4.h
339--- gcc-4.5.0.orig/gcc/config/rs6000/sysv4.h 2009-11-25 15:23:20.000000000 -0500
340+++ gcc-4.5.0/gcc/config/rs6000/sysv4.h 2010-07-25 16:12:35.117577311 -0400
[9722468]341@@ -901,8 +901,8 @@
342
343 #define LINK_START_LINUX_SPEC ""
344
345-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
346-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
347+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
348+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
349 #if UCLIBC_DEFAULT
350 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
351 #else
352@@ -944,7 +944,7 @@
353
354 #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
355 %{rdynamic:-export-dynamic} \
356- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
357+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
358
359 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \
360 %{!undef: \
[c0595573]361diff -Naur gcc-4.5.0.orig/gcc/config/rs6000/t-linux64 gcc-4.5.0/gcc/config/rs6000/t-linux64
362--- gcc-4.5.0.orig/gcc/config/rs6000/t-linux64 2009-04-21 15:03:23.000000000 -0400
363+++ gcc-4.5.0/gcc/config/rs6000/t-linux64 2010-07-25 16:14:58.202326412 -0400
364@@ -36,7 +36,7 @@
[9722468]365 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
366 MULTILIB_EXCEPTIONS = m64/msoft-float
367 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
368-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
[c0595573]369+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
[9722468]370 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
371
372 softfp_wrap_start := '\#ifndef __powerpc64__'
[c0595573]373diff -Naur gcc-4.5.0.orig/gcc/config/s390/linux.h gcc-4.5.0/gcc/config/s390/linux.h
374--- gcc-4.5.0.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400
375+++ gcc-4.5.0/gcc/config/s390/linux.h 2010-07-25 16:12:35.145576353 -0400
[9722468]376@@ -72,8 +72,8 @@
377 #define MULTILIB_DEFAULTS { "m31" }
378 #endif
379
380-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
381-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
382+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
383+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
384
385 #undef LINK_SPEC
386 #define LINK_SPEC \
[c0595573]387diff -Naur gcc-4.5.0.orig/gcc/config/s390/t-linux64 gcc-4.5.0/gcc/config/s390/t-linux64
388--- gcc-4.5.0.orig/gcc/config/s390/t-linux64 2009-10-07 04:26:47.000000000 -0400
389+++ gcc-4.5.0/gcc/config/s390/t-linux64 2010-07-25 16:15:08.293701559 -0400
390@@ -1,3 +1,3 @@
[9722468]391 MULTILIB_OPTIONS = m64/m31
392 MULTILIB_DIRNAMES = 64 32
393-MULTILIB_OSDIRNAMES = ../lib64 ../lib
394+MULTILIB_OSDIRNAMES = ../lib ../lib32
[c0595573]395diff -Naur gcc-4.5.0.orig/gcc/config/sh/linux.h gcc-4.5.0/gcc/config/sh/linux.h
396--- gcc-4.5.0.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400
397+++ gcc-4.5.0/gcc/config/sh/linux.h 2010-07-25 16:12:35.341576592 -0400
[9722468]398@@ -47,7 +47,7 @@
399
400 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
401
402-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
403+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
404
405 #undef SUBTARGET_LINK_EMUL_SUFFIX
406 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
[c0595573]407diff -Naur gcc-4.5.0.orig/gcc/config/sparc/linux.h gcc-4.5.0/gcc/config/sparc/linux.h
408--- gcc-4.5.0.orig/gcc/config/sparc/linux.h 2009-12-07 18:31:01.000000000 -0500
409+++ gcc-4.5.0/gcc/config/sparc/linux.h 2010-07-25 16:12:35.361577332 -0400
410@@ -83,10 +83,10 @@
411
412 /* If ELF is the default format, we should not use /lib/elf. */
413
414-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
415+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
416
417 #undef LINK_SPEC
418-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
419+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
420 %{!mno-relax:%{!r:-relax}} \
421 %{!shared: \
422 %{!ibcs: \
423diff -Naur gcc-4.5.0.orig/gcc/config/sparc/linux64.h gcc-4.5.0/gcc/config/sparc/linux64.h
424--- gcc-4.5.0.orig/gcc/config/sparc/linux64.h 2009-12-07 18:31:01.000000000 -0500
425+++ gcc-4.5.0/gcc/config/sparc/linux64.h 2010-07-25 16:12:35.369577243 -0400
[9722468]426@@ -109,8 +109,8 @@
427
428 /* If ELF is the default format, we should not use /lib/elf. */
429
430-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
431-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
432+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
433+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
434
435 #ifdef SPARC_BI_ARCH
436
437@@ -121,7 +121,7 @@
438 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
439 { "link_arch", LINK_ARCH_SPEC },
440
441-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
442+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
443 %{!shared: \
444 %{!ibcs: \
445 %{!static: \
446@@ -130,7 +130,7 @@
447 %{static:-static}}} \
448 "
449
450-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
451+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
452 %{!shared: \
453 %{!ibcs: \
454 %{!static: \
455@@ -211,7 +211,7 @@
456 #else /* !SPARC_BI_ARCH */
457
458 #undef LINK_SPEC
459-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
460+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
461 %{!shared: \
462 %{!ibcs: \
463 %{!static: \
[c0595573]464diff -Naur gcc-4.5.0.orig/gcc/config/sparc/t-linux64 gcc-4.5.0/gcc/config/sparc/t-linux64
465--- gcc-4.5.0.orig/gcc/config/sparc/t-linux64 2009-04-21 15:03:23.000000000 -0400
466+++ gcc-4.5.0/gcc/config/sparc/t-linux64 2010-07-25 16:15:41.705578470 -0400
467@@ -19,7 +19,7 @@
[9722468]468
469 MULTILIB_OPTIONS = m64/m32
470 MULTILIB_DIRNAMES = 64 32
471-MULTILIB_OSDIRNAMES = ../lib64 ../lib
472+MULTILIB_OSDIRNAMES = ../lib ../lib32
473
474 LIBGCC = stmp-multilib
475 INSTALL_LIBGCC = install-multilib
[c0595573]476diff -Naur gcc-4.5.0.orig/gcc/config/vax/linux.h gcc-4.5.0/gcc/config/vax/linux.h
477--- gcc-4.5.0.orig/gcc/config/vax/linux.h 2009-11-03 19:07:24.000000000 -0500
478+++ gcc-4.5.0/gcc/config/vax/linux.h 2010-07-25 16:12:35.269577363 -0400
479@@ -44,5 +44,5 @@
480 %{!shared: \
481 %{!static: \
482 %{rdynamic:-export-dynamic} \
483- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
484+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
485 %{static:-static}}"
486diff -Naur gcc-4.5.0.orig/gcc/config/xtensa/linux.h gcc-4.5.0/gcc/config/xtensa/linux.h
487--- gcc-4.5.0.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500
488+++ gcc-4.5.0/gcc/config/xtensa/linux.h 2010-07-25 16:12:35.081581396 -0400
[9722468]489@@ -43,7 +43,7 @@
490 %{mlongcalls:--longcalls} \
491 %{mno-longcalls:--no-longcalls}"
492
493-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
494+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
495
496 #undef LINK_SPEC
497 #define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.