source: patches/gcc-4.8.1-pure64_specs-1.patch@ c736074

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since c736074 was 578cf221, checked in by William Harrington <kb0iic@…>, 11 years ago

Add gcc-4.8.1 patches.
  • Property mode set to 100644
File size: 22.1 KB
RevLine 
[578cf221]1Submitted By: Martin Ward <macros_the_black@ntlworld.com>
2Date: 0r64-02-2013
3Initial Package Version: 4.8.1
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project.
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.
11
12diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/aarch64-linux.h gcc-4.8.1/gcc/config/aarch64/aarch64-linux.h
13--- gcc-4.8.1.orig/gcc/config/aarch64/aarch64-linux.h 2013-01-10 20:38:27.000000000 +0000
14+++ gcc-4.8.1/gcc/config/aarch64/aarch64-linux.h 2013-06-02 20:48:52.596058439 +0000
15@@ -21,7 +21,7 @@
16 #ifndef GCC_AARCH64_LINUX_H
17 #define GCC_AARCH64_LINUX_H
18
19-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
20+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64.so.1"
21
22 #define LINUX_TARGET_LINK_SPEC "%{h*} \
23 %{static:-Bstatic} \
24diff -Naur gcc-4.8.1.orig/gcc/config/aarch64/t-aarch64-linux gcc-4.8.1/gcc/config/aarch64/t-aarch64-linux
25--- gcc-4.8.1.orig/gcc/config/aarch64/t-aarch64-linux 2013-03-14 08:52:13.000000000 +0000
26+++ gcc-4.8.1/gcc/config/aarch64/t-aarch64-linux 2013-06-02 20:48:55.843818539 +0000
27@@ -22,4 +22,4 @@
28 LIB1ASMFUNCS = _aarch64_sync_cache_range
29
30 AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
31-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
32+MULTILIB_OSDIRNAMES = .=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
33diff -Naur gcc-4.8.1.orig/gcc/config/alpha/linux-elf.h gcc-4.8.1/gcc/config/alpha/linux-elf.h
34--- gcc-4.8.1.orig/gcc/config/alpha/linux-elf.h 2013-01-10 20:38:27.000000000 +0000
35+++ gcc-4.8.1/gcc/config/alpha/linux-elf.h 2013-06-02 20:48:58.367632115 +0000
36@@ -23,8 +23,8 @@
37 #define EXTRA_SPECS \
38 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
39
40-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
41-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
42+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
43+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
44 #if DEFAULT_LIBC == LIBC_UCLIBC
45 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
46 #elif DEFAULT_LIBC == LIBC_GLIBC
47diff -Naur gcc-4.8.1.orig/gcc/config/arm/linux-eabi.h gcc-4.8.1/gcc/config/arm/linux-eabi.h
48--- gcc-4.8.1.orig/gcc/config/arm/linux-eabi.h 2013-01-10 20:38:27.000000000 +0000
49+++ gcc-4.8.1/gcc/config/arm/linux-eabi.h 2013-06-02 20:49:01.627391330 +0000
50@@ -68,8 +68,8 @@
51 GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
52
53 #undef GLIBC_DYNAMIC_LINKER
54-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
55-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
56+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
57+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
58 #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
59
60 #define GLIBC_DYNAMIC_LINKER \
61diff -Naur gcc-4.8.1.orig/gcc/config/arm/linux-elf.h gcc-4.8.1/gcc/config/arm/linux-elf.h
62--- gcc-4.8.1.orig/gcc/config/arm/linux-elf.h 2013-01-10 20:38:27.000000000 +0000
63+++ gcc-4.8.1/gcc/config/arm/linux-elf.h 2013-06-02 20:49:13.502514165 +0000
64@@ -57,7 +57,7 @@
65
66 #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
67
68-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
69+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
70
71 #define LINUX_TARGET_LINK_SPEC "%{h*} \
72 %{static:-Bstatic} \
73diff -Naur gcc-4.8.1.orig/gcc/config/bfin/linux.h gcc-4.8.1/gcc/config/bfin/linux.h
74--- gcc-4.8.1.orig/gcc/config/bfin/linux.h 2013-01-10 20:38:27.000000000 +0000
75+++ gcc-4.8.1/gcc/config/bfin/linux.h 2013-06-02 20:49:16.242311787 +0000
76@@ -45,7 +45,7 @@
77 %{shared:-G -Bdynamic} \
78 %{!shared: %{!static: \
79 %{rdynamic:-export-dynamic} \
80- -dynamic-linker /lib/ld-uClibc.so.0} \
81+ -dynamic-linker /tools/lib/ld-uClibc.so.0} \
82 %{static}} -init __init -fini __fini"
83
84 #undef TARGET_SUPPORTS_SYNC_CALLS
85diff -Naur gcc-4.8.1.orig/gcc/config/cris/linux.h gcc-4.8.1/gcc/config/cris/linux.h
86--- gcc-4.8.1.orig/gcc/config/cris/linux.h 2013-01-10 20:38:27.000000000 +0000
87+++ gcc-4.8.1/gcc/config/cris/linux.h 2013-06-02 20:49:16.302307355 +0000
88@@ -102,7 +102,7 @@
89 #undef CRIS_DEFAULT_CPU_VERSION
90 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
91
92-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
93+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
94
95 #undef CRIS_LINK_SUBTARGET_SPEC
96 #define CRIS_LINK_SUBTARGET_SPEC \
97diff -Naur gcc-4.8.1.orig/gcc/config/freebsd-spec.h gcc-4.8.1/gcc/config/freebsd-spec.h
98--- gcc-4.8.1.orig/gcc/config/freebsd-spec.h 2013-01-10 20:38:27.000000000 +0000
99+++ gcc-4.8.1/gcc/config/freebsd-spec.h 2013-06-02 20:49:30.933226633 +0000
100@@ -130,7 +130,7 @@
101 #if FBSD_MAJOR < 6
102 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
103 #else
104-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
105+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
106 #endif
107
108 /* NOTE: The freebsd-spec.h header is included also for various
109diff -Naur gcc-4.8.1.orig/gcc/config/frv/linux.h gcc-4.8.1/gcc/config/frv/linux.h
110--- gcc-4.8.1.orig/gcc/config/frv/linux.h 2013-01-10 20:38:27.000000000 +0000
111+++ gcc-4.8.1/gcc/config/frv/linux.h 2013-06-02 20:49:30.933226633 +0000
112@@ -34,7 +34,7 @@
113 #define ENDFILE_SPEC \
114 "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
115
116-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
117+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
118
119 #undef LINK_SPEC
120 #define LINK_SPEC "\
121diff -Naur gcc-4.8.1.orig/gcc/config/i386/gnu.h gcc-4.8.1/gcc/config/i386/gnu.h
122--- gcc-4.8.1.orig/gcc/config/i386/gnu.h 2013-01-10 20:38:27.000000000 +0000
123+++ gcc-4.8.1/gcc/config/i386/gnu.h 2013-06-02 20:49:35.656877716 +0000
124@@ -22,7 +22,7 @@
125 #define GNU_USER_LINK_EMULATION "elf_i386"
126
127 #undef GNU_USER_DYNAMIC_LINKER
128-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
129+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
130
131 #undef STARTFILE_SPEC
132 #if defined HAVE_LD_PIE
133diff -Naur gcc-4.8.1.orig/gcc/config/i386/linux.h gcc-4.8.1/gcc/config/i386/linux.h
134--- gcc-4.8.1.orig/gcc/config/i386/linux.h 2013-01-10 20:38:27.000000000 +0000
135+++ gcc-4.8.1/gcc/config/i386/linux.h 2013-06-02 20:49:43.980262905 +0000
136@@ -20,4 +20,4 @@
137 <http://www.gnu.org/licenses/>. */
138
139 #define GNU_USER_LINK_EMULATION "elf_i386"
140-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
141+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
142diff -Naur gcc-4.8.1.orig/gcc/config/i386/linux64.h gcc-4.8.1/gcc/config/i386/linux64.h
143--- gcc-4.8.1.orig/gcc/config/i386/linux64.h 2013-01-10 20:38:27.000000000 +0000
144+++ gcc-4.8.1/gcc/config/i386/linux64.h 2013-06-02 20:49:47.148028917 +0000
145@@ -27,6 +27,6 @@
146 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
147 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
148
149-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
150-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
151-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
152+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
153+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
154+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
155diff -Naur gcc-4.8.1.orig/gcc/config/i386/t-linux64 gcc-4.8.1/gcc/config/i386/t-linux64
156--- gcc-4.8.1.orig/gcc/config/i386/t-linux64 2013-01-10 20:38:27.000000000 +0000
157+++ gcc-4.8.1/gcc/config/i386/t-linux64 2013-06-02 20:49:56.587331678 +0000
158@@ -33,6 +33,6 @@
159 comma=,
160 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
161 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
162-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
163-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
164+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
165+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
166 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
167diff -Naur gcc-4.8.1.orig/gcc/config/ia64/linux.h gcc-4.8.1/gcc/config/ia64/linux.h
168--- gcc-4.8.1.orig/gcc/config/ia64/linux.h 2013-01-10 20:38:27.000000000 +0000
169+++ gcc-4.8.1/gcc/config/ia64/linux.h 2013-06-02 20:49:57.399271704 +0000
170@@ -55,7 +55,7 @@
171 /* Define this for shared library support because it isn't in the main
172 linux.h file. */
173
174-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
175+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
176
177 #undef LINK_SPEC
178 #define LINK_SPEC "\
179diff -Naur gcc-4.8.1.orig/gcc/config/knetbsd-gnu.h gcc-4.8.1/gcc/config/knetbsd-gnu.h
180--- gcc-4.8.1.orig/gcc/config/knetbsd-gnu.h 2013-01-10 20:38:27.000000000 +0000
181+++ gcc-4.8.1/gcc/config/knetbsd-gnu.h 2013-06-02 20:49:58.407197252 +0000
182@@ -32,4 +32,4 @@
183
184
185 #undef GNU_USER_DYNAMIC_LINKER
186-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
187+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
188diff -Naur gcc-4.8.1.orig/gcc/config/kopensolaris-gnu.h gcc-4.8.1/gcc/config/kopensolaris-gnu.h
189--- gcc-4.8.1.orig/gcc/config/kopensolaris-gnu.h 2013-01-10 20:38:27.000000000 +0000
190+++ gcc-4.8.1/gcc/config/kopensolaris-gnu.h 2013-06-02 20:49:59.523114825 +0000
191@@ -31,4 +31,4 @@
192 while (0)
193
194 #undef GNU_USER_DYNAMIC_LINKER
195-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
196+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
197diff -Naur gcc-4.8.1.orig/gcc/config/linux.h gcc-4.8.1/gcc/config/linux.h
198--- gcc-4.8.1.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000
199+++ gcc-4.8.1/gcc/config/linux.h 2013-06-02 20:50:01.930936970 +0000
200@@ -73,10 +73,10 @@
201 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
202 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
203 supporting both 32-bit and 64-bit compilation. */
204-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
205-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
206-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
207-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
208+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
209+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
210+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
211+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
212 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
213 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
214 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
215diff -Naur gcc-4.8.1.orig/gcc/config/lm32/uclinux-elf.h gcc-4.8.1/gcc/config/lm32/uclinux-elf.h
216--- gcc-4.8.1.orig/gcc/config/lm32/uclinux-elf.h 2013-01-10 20:38:27.000000000 +0000
217+++ gcc-4.8.1/gcc/config/lm32/uclinux-elf.h 2013-06-02 20:50:04.018782750 +0000
218@@ -67,7 +67,7 @@
219 %{shared:-shared} \
220 %{symbolic:-Bsymbolic} \
221 %{rdynamic:-export-dynamic} \
222- -dynamic-linker /lib/ld-linux.so.2"
223+ -dynamic-linker /tools/lib/ld-linux.so.2"
224
225 #define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
226
227diff -Naur gcc-4.8.1.orig/gcc/config/m68k/linux.h gcc-4.8.1/gcc/config/m68k/linux.h
228--- gcc-4.8.1.orig/gcc/config/m68k/linux.h 2013-01-10 20:38:27.000000000 +0000
229+++ gcc-4.8.1/gcc/config/m68k/linux.h 2013-06-02 20:50:05.806650688 +0000
230@@ -71,7 +71,7 @@
231 When the -shared link option is used a final link is not being
232 done. */
233
234-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
235+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
236
237 #undef LINK_SPEC
238 #define LINK_SPEC "-m m68kelf %{shared} \
239diff -Naur gcc-4.8.1.orig/gcc/config/microblaze/linux.h gcc-4.8.1/gcc/config/microblaze/linux.h
240--- gcc-4.8.1.orig/gcc/config/microblaze/linux.h 2013-03-14 15:43:23.000000000 +0000
241+++ gcc-4.8.1/gcc/config/microblaze/linux.h 2013-06-02 20:50:06.870572103 +0000
242@@ -25,7 +25,7 @@
243 #undef TLS_NEEDS_GOT
244 #define TLS_NEEDS_GOT 1
245
246-#define DYNAMIC_LINKER "/lib/ld.so.1"
247+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
248 #undef SUBTARGET_EXTRA_SPECS
249 #define SUBTARGET_EXTRA_SPECS \
250 { "dynamic_linker", DYNAMIC_LINKER }
251diff -Naur gcc-4.8.1.orig/gcc/config/mips/linux.h gcc-4.8.1/gcc/config/mips/linux.h
252--- gcc-4.8.1.orig/gcc/config/mips/linux.h 2013-01-10 20:38:27.000000000 +0000
253+++ gcc-4.8.1/gcc/config/mips/linux.h 2013-06-02 20:50:07.506525127 +0000
254@@ -17,4 +17,4 @@
255 along with GCC; see the file COPYING3. If not see
256 <http://www.gnu.org/licenses/>. */
257
258-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
259+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
260diff -Naur gcc-4.8.1.orig/gcc/config/mips/linux64.h gcc-4.8.1/gcc/config/mips/linux64.h
261--- gcc-4.8.1.orig/gcc/config/mips/linux64.h 2013-01-10 20:38:27.000000000 +0000
262+++ gcc-4.8.1/gcc/config/mips/linux64.h 2013-06-02 20:50:08.110480515 +0000
263@@ -22,10 +22,10 @@
264 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
265 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
266
267-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
268-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
269-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
270-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
271+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
272+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
273+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
274+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
275 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
276 #define GNU_USER_DYNAMIC_LINKERN32 \
277 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
278diff -Naur gcc-4.8.1.orig/gcc/config/mips/t-linux64 gcc-4.8.1/gcc/config/mips/t-linux64
279--- gcc-4.8.1.orig/gcc/config/mips/t-linux64 2013-01-10 20:38:27.000000000 +0000
280+++ gcc-4.8.1/gcc/config/mips/t-linux64 2013-06-02 20:50:08.590445062 +0000
281@@ -22,5 +22,5 @@
282 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
283 MULTILIB_OSDIRNAMES = \
284 ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
285- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
286- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
287+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
288+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
289diff -Naur gcc-4.8.1.orig/gcc/config/mn10300/linux.h gcc-4.8.1/gcc/config/mn10300/linux.h
290--- gcc-4.8.1.orig/gcc/config/mn10300/linux.h 2013-01-10 20:38:27.000000000 +0000
291+++ gcc-4.8.1/gcc/config/mn10300/linux.h 2013-06-02 20:50:23.069375571 +0000
292@@ -32,7 +32,7 @@
293 #undef ASM_SPEC
294 #define ASM_SPEC ""
295
296-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
297+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
298
299 #undef LINK_SPEC
300 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
301diff -Naur gcc-4.8.1.orig/gcc/config/pa/pa-linux.h gcc-4.8.1/gcc/config/pa/pa-linux.h
302--- gcc-4.8.1.orig/gcc/config/pa/pa-linux.h 2013-01-10 20:38:27.000000000 +0000
303+++ gcc-4.8.1/gcc/config/pa/pa-linux.h 2013-06-02 20:50:24.285285757 +0000
304@@ -37,7 +37,7 @@
305 /* Define this for shared library support because it isn't in the main
306 linux.h file. */
307
308-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
309+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
310
311 #undef LINK_SPEC
312 #define LINK_SPEC "\
313diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/linux64.h gcc-4.8.1/gcc/config/rs6000/linux64.h
314--- gcc-4.8.1.orig/gcc/config/rs6000/linux64.h 2013-01-10 20:38:27.000000000 +0000
315+++ gcc-4.8.1/gcc/config/rs6000/linux64.h 2013-06-02 20:50:29.972865644 +0000
316@@ -360,10 +360,10 @@
317 #undef LINK_OS_DEFAULT_SPEC
318 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
319
320-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
321-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
322-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
323-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
324+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
325+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
326+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
327+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64-uClibc.so.0"
328 #if DEFAULT_LIBC == LIBC_UCLIBC
329 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
330 #elif DEFAULT_LIBC == LIBC_GLIBC
331diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/sysv4.h gcc-4.8.1/gcc/config/rs6000/sysv4.h
332--- gcc-4.8.1.orig/gcc/config/rs6000/sysv4.h 2013-01-10 20:38:27.000000000 +0000
333+++ gcc-4.8.1/gcc/config/rs6000/sysv4.h 2013-06-02 20:50:30.156852054 +0000
334@@ -787,8 +787,8 @@
335
336 #define LINK_START_LINUX_SPEC ""
337
338-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
339-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
340+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
341+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
342 #if DEFAULT_LIBC == LIBC_UCLIBC
343 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
344 #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
345diff -Naur gcc-4.8.1.orig/gcc/config/rs6000/t-linux64 gcc-4.8.1/gcc/config/rs6000/t-linux64
346--- gcc-4.8.1.orig/gcc/config/rs6000/t-linux64 2013-01-10 20:38:27.000000000 +0000
347+++ gcc-4.8.1/gcc/config/rs6000/t-linux64 2013-06-02 20:50:43.555862334 +0000
348@@ -28,5 +28,5 @@
349 MULTILIB_OPTIONS = m64/m32
350 MULTILIB_DIRNAMES = 64 32
351 MULTILIB_EXTRA_OPTS = fPIC
352-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
353-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
354+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:powerpc64-linux-gnu)
355+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
356diff -Naur gcc-4.8.1.orig/gcc/config/s390/linux.h gcc-4.8.1/gcc/config/s390/linux.h
357--- gcc-4.8.1.orig/gcc/config/s390/linux.h 2013-01-10 20:38:27.000000000 +0000
358+++ gcc-4.8.1/gcc/config/s390/linux.h 2013-06-02 20:50:48.235516671 +0000
359@@ -60,8 +60,8 @@
360 #define MULTILIB_DEFAULTS { "m31" }
361 #endif
362
363-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
364-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
365+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
366+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
367
368 #undef LINK_SPEC
369 #define LINK_SPEC \
370diff -Naur gcc-4.8.1.orig/gcc/config/s390/t-linux64 gcc-4.8.1/gcc/config/s390/t-linux64
371--- gcc-4.8.1.orig/gcc/config/s390/t-linux64 2012-11-21 16:13:28.000000000 +0000
372+++ gcc-4.8.1/gcc/config/s390/t-linux64 2013-06-02 20:51:04.050348509 +0000
373@@ -7,5 +7,5 @@
374
375 MULTILIB_OPTIONS = m64/m31
376 MULTILIB_DIRNAMES = 64 32
377-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
378-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
379+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
380+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
381diff -Naur gcc-4.8.1.orig/gcc/config/sh/linux.h gcc-4.8.1/gcc/config/sh/linux.h
382--- gcc-4.8.1.orig/gcc/config/sh/linux.h 2013-03-14 03:01:53.000000000 +0000
383+++ gcc-4.8.1/gcc/config/sh/linux.h 2013-06-02 20:51:04.170339644 +0000
384@@ -43,7 +43,7 @@
385
386 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
387
388-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
389+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
390
391 #undef SUBTARGET_LINK_EMUL_SUFFIX
392 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
393diff -Naur gcc-4.8.1.orig/gcc/config/sparc/linux.h gcc-4.8.1/gcc/config/sparc/linux.h
394--- gcc-4.8.1.orig/gcc/config/sparc/linux.h 2013-01-10 20:38:27.000000000 +0000
395+++ gcc-4.8.1/gcc/config/sparc/linux.h 2013-06-02 20:51:04.322328419 +0000
396@@ -83,7 +83,7 @@
397 When the -shared link option is used a final link is not being
398 done. */
399
400-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
401+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
402
403 #undef LINK_SPEC
404 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
405diff -Naur gcc-4.8.1.orig/gcc/config/sparc/linux64.h gcc-4.8.1/gcc/config/sparc/linux64.h
406--- gcc-4.8.1.orig/gcc/config/sparc/linux64.h 2013-01-10 20:38:27.000000000 +0000
407+++ gcc-4.8.1/gcc/config/sparc/linux64.h 2013-06-02 20:51:04.350326352 +0000
408@@ -92,8 +92,8 @@
409 When the -shared link option is used a final link is not being
410 done. */
411
412-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
413-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
414+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
415+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
416
417 #ifdef SPARC_BI_ARCH
418
419@@ -201,7 +201,7 @@
420 #else /* !SPARC_BI_ARCH */
421
422 #undef LINK_SPEC
423-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
424+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
425 %{!shared: \
426 %{!static: \
427 %{rdynamic:-export-dynamic} \
428diff -Naur gcc-4.8.1.orig/gcc/config/sparc/t-linux64 gcc-4.8.1/gcc/config/sparc/t-linux64
429--- gcc-4.8.1.orig/gcc/config/sparc/t-linux64 2013-01-10 20:38:27.000000000 +0000
430+++ gcc-4.8.1/gcc/config/sparc/t-linux64 2013-06-02 20:51:04.478316897 +0000
431@@ -25,5 +25,5 @@
432
433 MULTILIB_OPTIONS = m64/m32
434 MULTILIB_DIRNAMES = 64 32
435-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
436-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
437+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
438+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
439diff -Naur gcc-4.8.1.orig/gcc/config/vax/linux.h gcc-4.8.1/gcc/config/vax/linux.h
440--- gcc-4.8.1.orig/gcc/config/vax/linux.h 2013-01-10 20:38:27.000000000 +0000
441+++ gcc-4.8.1/gcc/config/vax/linux.h 2013-06-02 20:51:04.846289716 +0000
442@@ -41,7 +41,7 @@
443 %{!shared: \
444 %{!static: \
445 %{rdynamic:-export-dynamic} \
446- -dynamic-linker /lib/ld.so.1} \
447+ -dynamic-linker /tools/lib/ld.so.1} \
448 %{static:-static}}"
449
450 #undef WCHAR_TYPE
451diff -Naur gcc-4.8.1.orig/gcc/config/xtensa/linux.h gcc-4.8.1/gcc/config/xtensa/linux.h
452--- gcc-4.8.1.orig/gcc/config/xtensa/linux.h 2013-01-10 20:38:27.000000000 +0000
453+++ gcc-4.8.1/gcc/config/xtensa/linux.h 2013-06-02 20:51:06.614159132 +0000
454@@ -44,7 +44,7 @@
455 %{mlongcalls:--longcalls} \
456 %{mno-longcalls:--no-longcalls}"
457
458-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
459+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
460
461 #undef LINK_SPEC
462 #define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.