source: patches/gcc-4.6.3-pure64_specs-1.patch@ 954ff38

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 954ff38 was 736bb57, checked in by Jonathan Norman <jon@…>, 12 years ago

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