source: patches/gcc-4.5.2-pure64_specs-1.patch@ 957d7a0

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 957d7a0 was 670bf2c, checked in by Joe Ciccone <jciccone@…>, 14 years ago

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