source: patches/gcc-4.4.0-pure64_specs-2.patch@ 8287a15

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

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