source: patches/gcc-4.4.2-pure64_specs-1.patch@ b2d1ead

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

Add the new GCC Patches.
  • Property mode set to 100644
File size: 18.9 KB
RevLine 
[9722468]1Submitted By: Jim Gifford (jim at cross-lfs dot org)
2Date: 01-01-2010
3Initial Package Version: 4.4.2
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project.
6Upstream Status: Not Applied
7Description: This patch modifies the location of the dynamic linker for gcc-4.4.2.
8
9diff -Naur gcc-4.4.2.orig/gcc/config/alpha/gnu.h gcc-4.4.2/gcc/config/alpha/gnu.h
10--- gcc-4.4.2.orig/gcc/config/alpha/gnu.h 2004-09-07 20:17:19.000000000 -0400
11+++ gcc-4.4.2/gcc/config/alpha/gnu.h 2010-01-01 16:56:24.640499181 -0500
12@@ -11,7 +11,7 @@
13 } while (0)
14
15 #undef ELF_DYNAMIC_LINKER
16-#define ELF_DYNAMIC_LINKER "/lib/ld.so"
17+#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so"
18
19 #undef STARTFILE_SPEC
20 #define STARTFILE_SPEC \
21diff -Naur gcc-4.4.2.orig/gcc/config/alpha/linux-elf.h gcc-4.4.2/gcc/config/alpha/linux-elf.h
22--- gcc-4.4.2.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -0400
23+++ gcc-4.4.2/gcc/config/alpha/linux-elf.h 2010-01-01 16:56:24.465441698 -0500
24@@ -27,8 +27,8 @@
25 #define EXTRA_SPECS \
26 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
27
28-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
29-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
30+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
31+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
32 #if UCLIBC_DEFAULT
33 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
34 #else
35diff -Naur gcc-4.4.2.orig/gcc/config/arm/linux-eabi.h gcc-4.4.2/gcc/config/arm/linux-eabi.h
36--- gcc-4.4.2.orig/gcc/config/arm/linux-eabi.h 2007-11-08 08:44:09.000000000 -0500
37+++ gcc-4.4.2/gcc/config/arm/linux-eabi.h 2010-01-01 16:56:29.002439333 -0500
38@@ -61,7 +61,7 @@
39 /* Use ld-linux.so.3 so that it will be possible to run "classic"
40 GNU/Linux binaries on an EABI system. */
41 #undef GLIBC_DYNAMIC_LINKER
42-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
43+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
44
45 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
46 use the GNU/Linux version, not the generic BPABI version. */
47diff -Naur gcc-4.4.2.orig/gcc/config/arm/linux-elf.h gcc-4.4.2/gcc/config/arm/linux-elf.h
48--- gcc-4.4.2.orig/gcc/config/arm/linux-elf.h 2009-02-20 10:20:38.000000000 -0500
49+++ gcc-4.4.2/gcc/config/arm/linux-elf.h 2010-01-01 16:56:28.405503916 -0500
50@@ -62,7 +62,7 @@
51
52 #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
53
54-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
55+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
56
57 #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
58 %{b} \
59diff -Naur gcc-4.4.2.orig/gcc/config/bfin/linux.h gcc-4.4.2/gcc/config/bfin/linux.h
60--- gcc-4.4.2.orig/gcc/config/bfin/linux.h 2008-11-27 04:11:50.000000000 -0500
61+++ gcc-4.4.2/gcc/config/bfin/linux.h 2010-01-01 16:56:34.082561691 -0500
62@@ -22,7 +22,7 @@
63 %{shared:-G -Bdynamic} \
64 %{!shared: %{!static: \
65 %{rdynamic:-export-dynamic} \
66- %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
67+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
68 %{static}} -init __init -fini __fini"
69
70 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
71diff -Naur gcc-4.4.2.orig/gcc/config/cris/linux.h gcc-4.4.2/gcc/config/cris/linux.h
72--- gcc-4.4.2.orig/gcc/config/cris/linux.h 2009-03-22 11:15:04.000000000 -0400
73+++ gcc-4.4.2/gcc/config/cris/linux.h 2010-01-01 16:56:29.197595306 -0500
74@@ -103,7 +103,7 @@
75 #undef CRIS_DEFAULT_CPU_VERSION
76 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
77
78-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
79+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
80
81 /* We need an -rpath-link to ld.so.1, and presumably to each directory
82 specified with -B. */
83diff -Naur gcc-4.4.2.orig/gcc/config/frv/linux.h gcc-4.4.2/gcc/config/frv/linux.h
84--- gcc-4.4.2.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -0400
85+++ gcc-4.4.2/gcc/config/frv/linux.h 2010-01-01 16:56:26.579441307 -0500
86@@ -35,7 +35,7 @@
87 #define ENDFILE_SPEC \
88 "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
89
90-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
91+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
92
93 #undef LINK_SPEC
94 #define LINK_SPEC "\
95diff -Naur gcc-4.4.2.orig/gcc/config/i386/gnu.h gcc-4.4.2/gcc/config/i386/gnu.h
96--- gcc-4.4.2.orig/gcc/config/i386/gnu.h 2008-11-13 18:28:46.000000000 -0500
97+++ gcc-4.4.2/gcc/config/i386/gnu.h 2010-01-01 16:56:27.660591689 -0500
98@@ -21,7 +21,7 @@
99 */
100
101 #undef GLIBC_DYNAMIC_LINKER
102-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
103+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
104
105 #undef TARGET_VERSION
106 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
107diff -Naur gcc-4.4.2.orig/gcc/config/i386/linux64.h gcc-4.4.2/gcc/config/i386/linux64.h
108--- gcc-4.4.2.orig/gcc/config/i386/linux64.h 2009-04-09 19:23:07.000000000 -0400
109+++ gcc-4.4.2/gcc/config/i386/linux64.h 2010-01-01 16:56:27.978561695 -0500
110@@ -58,8 +58,8 @@
111 When the -shared link option is used a final link is not being
112 done. */
113
114-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
115-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
116+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
117+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
118
119 #undef ASM_SPEC
120 #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
121diff -Naur gcc-4.4.2.orig/gcc/config/i386/linux.h gcc-4.4.2/gcc/config/i386/linux.h
122--- gcc-4.4.2.orig/gcc/config/i386/linux.h 2009-05-21 09:21:30.000000000 -0400
123+++ gcc-4.4.2/gcc/config/i386/linux.h 2010-01-01 16:56:27.558655683 -0500
124@@ -100,7 +100,7 @@
125
126 /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
127 #define LINK_EMULATION "elf_i386"
128-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
129+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
130
131 #undef ASM_SPEC
132 #define ASM_SPEC \
133diff -Naur gcc-4.4.2.orig/gcc/config/i386/t-linux64 gcc-4.4.2/gcc/config/i386/t-linux64
134--- gcc-4.4.2.orig/gcc/config/i386/t-linux64 2008-07-02 11:59:19.000000000 -0400
135+++ gcc-4.4.2/gcc/config/i386/t-linux64 2010-01-01 16:56:34.209563694 -0500
136@@ -7,7 +7,7 @@
137
138 MULTILIB_OPTIONS = m64/m32
139 MULTILIB_DIRNAMES = 64 32
140-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
141+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
142
143 LIBGCC = stmp-multilib
144 INSTALL_LIBGCC = install-multilib
145diff -Naur gcc-4.4.2.orig/gcc/config/ia64/linux.h gcc-4.4.2/gcc/config/ia64/linux.h
146--- gcc-4.4.2.orig/gcc/config/ia64/linux.h 2009-02-12 11:30:53.000000000 -0500
147+++ gcc-4.4.2/gcc/config/ia64/linux.h 2010-01-01 16:56:24.987436691 -0500
148@@ -37,7 +37,7 @@
149 /* Define this for shared library support because it isn't in the main
150 linux.h file. */
151
152-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
153+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
154
155 #undef LINK_SPEC
156 #define LINK_SPEC "\
157diff -Naur gcc-4.4.2.orig/gcc/config/kopensolaris-gnu.h gcc-4.4.2/gcc/config/kopensolaris-gnu.h
158--- gcc-4.4.2.orig/gcc/config/kopensolaris-gnu.h 2009-01-29 13:48:41.000000000 -0500
159+++ gcc-4.4.2/gcc/config/kopensolaris-gnu.h 2010-01-01 16:56:30.755566240 -0500
160@@ -33,5 +33,5 @@
161
162 #ifdef GLIBC_DYNAMIC_LINKER
163 #undef GLIBC_DYNAMIC_LINKER
164-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
165+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
166 #endif
167diff -Naur gcc-4.4.2.orig/gcc/config/linux.h gcc-4.4.2/gcc/config/linux.h
168--- gcc-4.4.2.orig/gcc/config/linux.h 2009-04-09 19:23:07.000000000 -0400
169+++ gcc-4.4.2/gcc/config/linux.h 2010-01-01 16:56:30.600624174 -0500
170@@ -117,9 +117,9 @@
171 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
172 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
173 supporting both 32-bit and 64-bit compilation. */
174-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
175-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
176-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
177+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
178+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
179+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
180 #define LINUX_DYNAMIC_LINKER \
181 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
182 #define LINUX_DYNAMIC_LINKER32 \
183diff -Naur gcc-4.4.2.orig/gcc/config/m32r/linux.h gcc-4.4.2/gcc/config/m32r/linux.h
184--- gcc-4.4.2.orig/gcc/config/m32r/linux.h 2007-08-02 06:49:31.000000000 -0400
185+++ gcc-4.4.2/gcc/config/m32r/linux.h 2010-01-01 16:56:31.478592892 -0500
186@@ -58,7 +58,7 @@
187
188 /* If ELF is the default format, we should not use /lib/elf. */
189
190-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
191+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
192
193 #undef LINK_SPEC
194 #if TARGET_LITTLE_ENDIAN
195diff -Naur gcc-4.4.2.orig/gcc/config/m68k/linux.h gcc-4.4.2/gcc/config/m68k/linux.h
196--- gcc-4.4.2.orig/gcc/config/m68k/linux.h 2007-09-24 17:07:08.000000000 -0400
197+++ gcc-4.4.2/gcc/config/m68k/linux.h 2010-01-01 16:56:31.712593048 -0500
198@@ -84,7 +84,7 @@
199
200 /* If ELF is the default format, we should not use /lib/elf. */
201
202-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
203+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
204
205 #undef LINK_SPEC
206 #define LINK_SPEC "-m m68kelf %{shared} \
207diff -Naur gcc-4.4.2.orig/gcc/config/mips/linux64.h gcc-4.4.2/gcc/config/mips/linux64.h
208--- gcc-4.4.2.orig/gcc/config/mips/linux64.h 2009-02-20 10:20:38.000000000 -0500
209+++ gcc-4.4.2/gcc/config/mips/linux64.h 2010-01-01 16:56:33.817493556 -0500
210@@ -35,10 +35,10 @@
211 %{!shared: \
212 %{profile:-lc_p} %{!profile:-lc}}"
213
214-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
215-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
216-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
217-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
218+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
219+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
220+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
221+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
222 #define LINUX_DYNAMIC_LINKERN32 \
223 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
224
225diff -Naur gcc-4.4.2.orig/gcc/config/mips/linux.h gcc-4.4.2/gcc/config/mips/linux.h
226--- gcc-4.4.2.orig/gcc/config/mips/linux.h 2009-02-20 10:20:38.000000000 -0500
227+++ gcc-4.4.2/gcc/config/mips/linux.h 2010-01-01 16:56:33.589561959 -0500
228@@ -64,7 +64,7 @@
229 #undef MIPS_DEFAULT_GVALUE
230 #define MIPS_DEFAULT_GVALUE 0
231
232-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
233+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
234
235 /* Borrowed from sparc/linux.h */
236 #undef LINK_SPEC
237diff -Naur gcc-4.4.2.orig/gcc/config/mips/t-linux64 gcc-4.4.2/gcc/config/mips/t-linux64
238--- gcc-4.4.2.orig/gcc/config/mips/t-linux64 2006-06-06 08:51:24.000000000 -0400
239+++ gcc-4.4.2/gcc/config/mips/t-linux64 2010-01-01 16:56:34.458660181 -0500
240@@ -1,6 +1,6 @@
241 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
242 MULTILIB_DIRNAMES = n32 32 64
243-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
244+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
245
246 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
247
248diff -Naur gcc-4.4.2.orig/gcc/config/mn10300/linux.h gcc-4.4.2/gcc/config/mn10300/linux.h
249--- gcc-4.4.2.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400
250+++ gcc-4.4.2/gcc/config/mn10300/linux.h 2010-01-01 16:56:31.369561693 -0500
251@@ -32,7 +32,7 @@
252 #undef ASM_SPEC
253 #define ASM_SPEC "%{Wa,*:%*}"
254
255-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
256+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
257
258 #undef LINK_SPEC
259 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
260diff -Naur gcc-4.4.2.orig/gcc/config/pa/pa-linux.h gcc-4.4.2/gcc/config/pa/pa-linux.h
261--- gcc-4.4.2.orig/gcc/config/pa/pa-linux.h 2007-08-02 06:49:31.000000000 -0400
262+++ gcc-4.4.2/gcc/config/pa/pa-linux.h 2010-01-01 16:56:25.821468275 -0500
263@@ -44,7 +44,7 @@
264 /* Define this for shared library support because it isn't in the main
265 linux.h file. */
266
267-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
268+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
269
270 #undef LINK_SPEC
271 #define LINK_SPEC "\
272diff -Naur gcc-4.4.2.orig/gcc/config/rs6000/linux64.h gcc-4.4.2/gcc/config/rs6000/linux64.h
273--- gcc-4.4.2.orig/gcc/config/rs6000/linux64.h 2009-04-09 19:23:07.000000000 -0400
274+++ gcc-4.4.2/gcc/config/rs6000/linux64.h 2010-01-01 16:56:30.187504724 -0500
275@@ -342,10 +342,10 @@
276 #undef LINK_OS_DEFAULT_SPEC
277 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
278
279-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
280-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
281-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
282-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
283+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
284+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
285+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
286+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
287 #if UCLIBC_DEFAULT
288 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
289 #else
290diff -Naur gcc-4.4.2.orig/gcc/config/rs6000/sysv4.h gcc-4.4.2/gcc/config/rs6000/sysv4.h
291--- gcc-4.4.2.orig/gcc/config/rs6000/sysv4.h 2009-04-09 19:23:07.000000000 -0400
292+++ gcc-4.4.2/gcc/config/rs6000/sysv4.h 2010-01-01 16:56:29.858530584 -0500
293@@ -901,8 +901,8 @@
294
295 #define LINK_START_LINUX_SPEC ""
296
297-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
298-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
299+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
300+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
301 #if UCLIBC_DEFAULT
302 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
303 #else
304@@ -944,7 +944,7 @@
305
306 #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
307 %{rdynamic:-export-dynamic} \
308- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
309+ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
310
311 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \
312 %{!undef: \
313diff -Naur gcc-4.4.2.orig/gcc/config/rs6000/t-linux64 gcc-4.4.2/gcc/config/rs6000/t-linux64
314--- gcc-4.4.2.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400
315+++ gcc-4.4.2/gcc/config/rs6000/t-linux64 2010-01-01 16:56:34.307479149 -0500
316@@ -19,7 +19,7 @@
317 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
318 MULTILIB_EXCEPTIONS = m64/msoft-float
319 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
320-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
321+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
322 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
323
324 softfp_wrap_start := '\#ifndef __powerpc64__'
325diff -Naur gcc-4.4.2.orig/gcc/config/s390/linux.h gcc-4.4.2/gcc/config/s390/linux.h
326--- gcc-4.4.2.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400
327+++ gcc-4.4.2/gcc/config/s390/linux.h 2010-01-01 16:56:31.307561791 -0500
328@@ -72,8 +72,8 @@
329 #define MULTILIB_DEFAULTS { "m31" }
330 #endif
331
332-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
333-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
334+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
335+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
336
337 #undef LINK_SPEC
338 #define LINK_SPEC \
339diff -Naur gcc-4.4.2.orig/gcc/config/s390/t-linux64 gcc-4.4.2/gcc/config/s390/t-linux64
340--- gcc-4.4.2.orig/gcc/config/s390/t-linux64 2006-02-06 12:41:54.000000000 -0500
341+++ gcc-4.4.2/gcc/config/s390/t-linux64 2010-01-01 16:56:34.344633775 -0500
342@@ -1,6 +1,6 @@
343 MULTILIB_OPTIONS = m64/m31
344 MULTILIB_DIRNAMES = 64 32
345-MULTILIB_OSDIRNAMES = ../lib64 ../lib
346+MULTILIB_OSDIRNAMES = ../lib ../lib32
347
348 LIBGCC = stmp-multilib
349 INSTALL_LIBGCC = install-multilib
350diff -Naur gcc-4.4.2.orig/gcc/config/sh/linux.h gcc-4.4.2/gcc/config/sh/linux.h
351--- gcc-4.4.2.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400
352+++ gcc-4.4.2/gcc/config/sh/linux.h 2010-01-01 16:56:32.970573934 -0500
353@@ -47,7 +47,7 @@
354
355 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
356
357-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
358+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
359
360 #undef SUBTARGET_LINK_EMUL_SUFFIX
361 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
362diff -Naur gcc-4.4.2.orig/gcc/config/sparc/linux64.h gcc-4.4.2/gcc/config/sparc/linux64.h
363--- gcc-4.4.2.orig/gcc/config/sparc/linux64.h 2009-02-20 10:20:38.000000000 -0500
364+++ gcc-4.4.2/gcc/config/sparc/linux64.h 2010-01-01 16:56:32.599626104 -0500
365@@ -109,8 +109,8 @@
366
367 /* If ELF is the default format, we should not use /lib/elf. */
368
369-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
370-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
371+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
372+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
373
374 #ifdef SPARC_BI_ARCH
375
376@@ -121,7 +121,7 @@
377 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
378 { "link_arch", LINK_ARCH_SPEC },
379
380-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
381+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
382 %{!shared: \
383 %{!ibcs: \
384 %{!static: \
385@@ -130,7 +130,7 @@
386 %{static:-static}}} \
387 "
388
389-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
390+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
391 %{!shared: \
392 %{!ibcs: \
393 %{!static: \
394@@ -211,7 +211,7 @@
395 #else /* !SPARC_BI_ARCH */
396
397 #undef LINK_SPEC
398-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
399+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
400 %{!shared: \
401 %{!ibcs: \
402 %{!static: \
403diff -Naur gcc-4.4.2.orig/gcc/config/sparc/linux.h gcc-4.4.2/gcc/config/sparc/linux.h
404--- gcc-4.4.2.orig/gcc/config/sparc/linux.h 2009-02-20 10:20:38.000000000 -0500
405+++ gcc-4.4.2/gcc/config/sparc/linux.h 2010-01-01 16:56:32.288437057 -0500
406@@ -83,10 +83,10 @@
407
408 /* If ELF is the default format, we should not use /lib/elf. */
409
410-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
411+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
412
413 #undef LINK_SPEC
414-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
415+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
416 %{!mno-relax:%{!r:-relax}} \
417 %{!shared: \
418 %{!ibcs: \
419diff -Naur gcc-4.4.2.orig/gcc/config/sparc/t-linux64 gcc-4.4.2/gcc/config/sparc/t-linux64
420--- gcc-4.4.2.orig/gcc/config/sparc/t-linux64 2006-02-08 02:19:43.000000000 -0500
421+++ gcc-4.4.2/gcc/config/sparc/t-linux64 2010-01-01 16:56:34.397501569 -0500
422@@ -1,6 +1,6 @@
423 MULTILIB_OPTIONS = m64/m32
424 MULTILIB_DIRNAMES = 64 32
425-MULTILIB_OSDIRNAMES = ../lib64 ../lib
426+MULTILIB_OSDIRNAMES = ../lib ../lib32
427
428 LIBGCC = stmp-multilib
429 INSTALL_LIBGCC = install-multilib
430diff -Naur gcc-4.4.2.orig/gcc/config/xtensa/linux.h gcc-4.4.2/gcc/config/xtensa/linux.h
431--- gcc-4.4.2.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500
432+++ gcc-4.4.2/gcc/config/xtensa/linux.h 2010-01-01 16:56:25.267566321 -0500
433@@ -43,7 +43,7 @@
434 %{mlongcalls:--longcalls} \
435 %{mno-longcalls:--no-longcalls}"
436
437-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
438+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
439
440 #undef LINK_SPEC
441 #define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.