source: patches/gcc-7.1.0-pure64_specs-1.patch

systemd
Last change on this file was 67068ff, checked in by William Harrington <kb0iic@…>, 7 years ago

Update patches with the proper data.
  • Property mode set to 100644
File size: 19.9 KB
RevLine 
[67068ff]1Submitted By: William Harrington <kb0iic at cross-lfs dot org>
2Date: 05-13-2017
3Initial Package Version: 6.1.0
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project with help from
6 Martin Ward and Chris Staub
7Upstream Status: Not Applied - CLFS Specific
8Description: This patch makes changes to the paths for pure64, eg 64bit libs
9 in /usr/lib, 32bit in /usr/lib32.
10Comment: Rediffed for 7.1.0
11
12diff -Naur gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h
13--- gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h 2017-01-01 12:07:43.000000000 +0000
14+++ gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h 2017-05-14 03:36:52.526644991 +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%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
20+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
21
22 #undef MUSL_DYNAMIC_LINKER
23 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
24diff -Naur gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h gcc-7.1.0/gcc/config/alpha/linux-elf.h
25--- gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h 2017-01-01 12:07:43.000000000 +0000
26+++ gcc-7.1.0/gcc/config/alpha/linux-elf.h 2017-05-14 03:36:52.526644991 +0000
27@@ -23,8 +23,8 @@
28 #define EXTRA_SPECS \
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 DEFAULT_LIBC == LIBC_UCLIBC
36 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
37 #elif DEFAULT_LIBC == LIBC_GLIBC
38diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h gcc-7.1.0/gcc/config/arm/linux-eabi.h
39--- gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h 2017-01-01 12:07:43.000000000 +0000
40+++ gcc-7.1.0/gcc/config/arm/linux-eabi.h 2017-05-14 03:36:52.527645006 +0000
41@@ -62,8 +62,8 @@
42 GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
43
44 #undef GLIBC_DYNAMIC_LINKER
45-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
46-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
47+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
48+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
49 #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
50
51 #define GLIBC_DYNAMIC_LINKER \
52diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-elf.h gcc-7.1.0/gcc/config/arm/linux-elf.h
53--- gcc-7.1.0.orig/gcc/config/arm/linux-elf.h 2017-01-01 12:07:43.000000000 +0000
54+++ gcc-7.1.0/gcc/config/arm/linux-elf.h 2017-05-14 03:36:52.527645006 +0000
55@@ -60,7 +60,7 @@
56
57 #define LIBGCC_SPEC "%{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*} \
63 %{static:-Bstatic} \
64diff -Naur gcc-7.1.0.orig/gcc/config/bfin/linux.h gcc-7.1.0/gcc/config/bfin/linux.h
65--- gcc-7.1.0.orig/gcc/config/bfin/linux.h 2017-01-01 12:07:43.000000000 +0000
66+++ gcc-7.1.0/gcc/config/bfin/linux.h 2017-05-14 03:36:52.528645020 +0000
67@@ -48,7 +48,7 @@
68 %{shared:-G -Bdynamic} \
69 %{!shared: %{!static: \
70 %{rdynamic:-export-dynamic} \
71- -dynamic-linker /lib/ld-uClibc.so.0} \
72+ -dynamic-linker /tools/lib/ld-uClibc.so.0} \
73 %{static}} -init __init -fini __fini"
74
75 #undef TARGET_SUPPORTS_SYNC_CALLS
76diff -Naur gcc-7.1.0.orig/gcc/config/c6x/uclinux-elf.h gcc-7.1.0/gcc/config/c6x/uclinux-elf.h
77--- gcc-7.1.0.orig/gcc/config/c6x/uclinux-elf.h 2017-01-01 12:07:43.000000000 +0000
78+++ gcc-7.1.0/gcc/config/c6x/uclinux-elf.h 2017-05-14 03:36:52.528645020 +0000
79@@ -36,7 +36,7 @@
80 #define STARTFILE_SPEC \
81 "%{!shared:crt1%O%s} crti%O%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
82
83-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
84+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
85
86 #undef LINK_SPEC
87 #define LINK_SPEC ENDIAN_LINK_SPEC \
88diff -Naur gcc-7.1.0.orig/gcc/config/cris/linux.h gcc-7.1.0/gcc/config/cris/linux.h
89--- gcc-7.1.0.orig/gcc/config/cris/linux.h 2017-01-01 12:07:43.000000000 +0000
90+++ gcc-7.1.0/gcc/config/cris/linux.h 2017-05-14 03:36:52.528645020 +0000
91@@ -102,7 +102,7 @@
92 #undef CRIS_DEFAULT_CPU_VERSION
93 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
94
95-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
96+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
97
98 #undef CRIS_LINK_SUBTARGET_SPEC
99 #define CRIS_LINK_SUBTARGET_SPEC \
100diff -Naur gcc-7.1.0.orig/gcc/config/freebsd-spec.h gcc-7.1.0/gcc/config/freebsd-spec.h
101--- gcc-7.1.0.orig/gcc/config/freebsd-spec.h 2017-01-01 12:07:43.000000000 +0000
102+++ gcc-7.1.0/gcc/config/freebsd-spec.h 2017-05-14 03:36:52.529645035 +0000
103@@ -131,7 +131,7 @@
104 #if FBSD_MAJOR < 6
105 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
106 #else
107-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
108+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
109 #endif
110
111 /* NOTE: The freebsd-spec.h header is included also for various
112diff -Naur gcc-7.1.0.orig/gcc/config/frv/linux.h gcc-7.1.0/gcc/config/frv/linux.h
113--- gcc-7.1.0.orig/gcc/config/frv/linux.h 2017-01-01 12:07:43.000000000 +0000
114+++ gcc-7.1.0/gcc/config/frv/linux.h 2017-05-14 03:36:52.529645035 +0000
115@@ -34,7 +34,7 @@
116 #define ENDFILE_SPEC \
117 "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
118
119-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
120+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
121
122 #undef LINK_SPEC
123 #define LINK_SPEC "\
124diff -Naur gcc-7.1.0.orig/gcc/config/i386/gnu.h gcc-7.1.0/gcc/config/i386/gnu.h
125--- gcc-7.1.0.orig/gcc/config/i386/gnu.h 2017-01-01 12:07:43.000000000 +0000
126+++ gcc-7.1.0/gcc/config/i386/gnu.h 2017-05-14 03:36:52.529645035 +0000
127@@ -22,7 +22,7 @@
128 #define GNU_USER_LINK_EMULATION "elf_i386"
129
130 #undef GNU_USER_DYNAMIC_LINKER
131-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
132+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
133
134 #undef STARTFILE_SPEC
135 #if defined HAVE_LD_PIE
136diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h
137--- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h 2017-01-01 12:07:43.000000000 +0000
138+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h 2017-05-14 03:36:52.529645035 +0000
139@@ -19,4 +19,4 @@
140 <http://www.gnu.org/licenses/>. */
141
142 #define GNU_USER_LINK_EMULATION "elf_i386_fbsd"
143-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
144+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
145diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h
146--- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h 2017-01-01 12:07:43.000000000 +0000
147+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h 2017-05-14 03:36:52.529645035 +0000
148@@ -22,6 +22,6 @@
149 #define GNU_USER_LINK_EMULATION64 "elf_x86_64_fbsd"
150 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64_fbsd"
151
152-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
153-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
154-#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-kfreebsd-x32.so.1"
155+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
156+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-kfreebsd-x86-64.so.1"
157+#define GLIBC_DYNAMIC_LINKERX32 "/tools/lib/ld-kfreebsd-x32.so.1"
158diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux.h gcc-7.1.0/gcc/config/i386/linux.h
159--- gcc-7.1.0.orig/gcc/config/i386/linux.h 2017-01-01 12:07:43.000000000 +0000
160+++ gcc-7.1.0/gcc/config/i386/linux.h 2017-05-14 03:36:52.529645035 +0000
161@@ -20,7 +20,7 @@
162 <http://www.gnu.org/licenses/>. */
163
164 #define GNU_USER_LINK_EMULATION "elf_i386"
165-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
166+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
167
168 #undef MUSL_DYNAMIC_LINKER
169 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
170diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
171--- gcc-7.1.0.orig/gcc/config/i386/linux64.h 2017-01-01 12:07:43.000000000 +0000
172+++ gcc-7.1.0/gcc/config/i386/linux64.h 2017-05-14 03:36:52.530645050 +0000
173@@ -27,9 +27,9 @@
174 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
175 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
176
177-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
178-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
179-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
180+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
181+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
182+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
183
184 #undef MUSL_DYNAMIC_LINKER32
185 #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
186diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64
187--- gcc-7.1.0.orig/gcc/config/i386/t-linux64 2017-01-01 12:07:43.000000000 +0000
188+++ gcc-7.1.0/gcc/config/i386/t-linux64 2017-05-14 03:36:52.530645050 +0000
189@@ -33,6 +33,6 @@
190 comma=,
191 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
192 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
193-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
194-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
195+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
196+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
197 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
198diff -Naur gcc-7.1.0.orig/gcc/config/ia64/linux.h gcc-7.1.0/gcc/config/ia64/linux.h
199--- gcc-7.1.0.orig/gcc/config/ia64/linux.h 2017-01-01 12:07:43.000000000 +0000
200+++ gcc-7.1.0/gcc/config/ia64/linux.h 2017-05-14 03:36:52.531645064 +0000
201@@ -55,7 +55,7 @@
202 /* Define this for shared library support because it isn't in the main
203 linux.h file. */
204
205-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
206+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
207
208 #undef LINK_SPEC
209 #define LINK_SPEC "\
210diff -Naur gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h gcc-7.1.0/gcc/config/kopensolaris-gnu.h
211--- gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h 2017-01-01 12:07:43.000000000 +0000
212+++ gcc-7.1.0/gcc/config/kopensolaris-gnu.h 2017-05-14 03:36:52.531645064 +0000
213@@ -31,4 +31,4 @@
214 while (0)
215
216 #undef GNU_USER_DYNAMIC_LINKER
217-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
218+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
219diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
220--- gcc-7.1.0.orig/gcc/config/linux.h 2017-01-01 12:07:43.000000000 +0000
221+++ gcc-7.1.0/gcc/config/linux.h 2017-05-14 03:36:52.531645064 +0000
222@@ -81,10 +81,10 @@
223 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
224 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
225 supporting both 32-bit and 64-bit compilation. */
226-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
227-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
228-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
229-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
230+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
231+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
232+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
233+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
234 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
235 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
236 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
237diff -Naur gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h gcc-7.1.0/gcc/config/lm32/uclinux-elf.h
238--- gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h 2017-01-01 12:07:43.000000000 +0000
239+++ gcc-7.1.0/gcc/config/lm32/uclinux-elf.h 2017-05-14 03:36:52.531645064 +0000
240@@ -67,7 +67,7 @@
241 %{shared:-shared} \
242 %{symbolic:-Bsymbolic} \
243 %{rdynamic:-export-dynamic} \
244- -dynamic-linker /lib/ld-linux.so.2"
245+ -dynamic-linker /tools/lib/ld-linux.so.2"
246
247 #define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
248
249diff -Naur gcc-7.1.0.orig/gcc/config/m32r/linux.h gcc-7.1.0/gcc/config/m32r/linux.h
250--- gcc-7.1.0.orig/gcc/config/m32r/linux.h 2017-01-01 12:07:43.000000000 +0000
251+++ gcc-7.1.0/gcc/config/m32r/linux.h 2017-05-14 03:36:52.532645079 +0000
252@@ -37,7 +37,7 @@
253 When the -shared link option is used a final link is not being
254 done. */
255
256-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
257+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
258
259 #undef LINK_SPEC
260 #if TARGET_LITTLE_ENDIAN
261diff -Naur gcc-7.1.0.orig/gcc/config/m68k/linux.h gcc-7.1.0/gcc/config/m68k/linux.h
262--- gcc-7.1.0.orig/gcc/config/m68k/linux.h 2017-01-06 21:21:02.000000000 +0000
263+++ gcc-7.1.0/gcc/config/m68k/linux.h 2017-05-14 03:36:52.532645079 +0000
264@@ -71,7 +71,7 @@
265 When the -shared link option is used a final link is not being
266 done. */
267
268-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
269+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
270
271 #undef LINK_SPEC
272 #define LINK_SPEC "-m m68kelf %{shared} \
273diff -Naur gcc-7.1.0.orig/gcc/config/microblaze/linux.h gcc-7.1.0/gcc/config/microblaze/linux.h
274--- gcc-7.1.0.orig/gcc/config/microblaze/linux.h 2017-01-01 12:07:43.000000000 +0000
275+++ gcc-7.1.0/gcc/config/microblaze/linux.h 2017-05-14 03:36:52.532645079 +0000
276@@ -28,7 +28,7 @@
277 #undef TLS_NEEDS_GOT
278 #define TLS_NEEDS_GOT 1
279
280-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
281+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
282 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
283
284 #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
285diff -Naur gcc-7.1.0.orig/gcc/config/mn10300/linux.h gcc-7.1.0/gcc/config/mn10300/linux.h
286--- gcc-7.1.0.orig/gcc/config/mn10300/linux.h 2017-01-01 12:07:43.000000000 +0000
287+++ gcc-7.1.0/gcc/config/mn10300/linux.h 2017-05-14 03:36:52.532645079 +0000
288@@ -32,7 +32,7 @@
289 #undef ASM_SPEC
290 #define ASM_SPEC ""
291
292-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
293+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
294
295 #undef LINK_SPEC
296 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
297diff -Naur gcc-7.1.0.orig/gcc/config/nios2/linux.h gcc-7.1.0/gcc/config/nios2/linux.h
298--- gcc-7.1.0.orig/gcc/config/nios2/linux.h 2017-01-01 12:07:43.000000000 +0000
299+++ gcc-7.1.0/gcc/config/nios2/linux.h 2017-05-14 03:36:52.532645079 +0000
300@@ -29,7 +29,7 @@
301 #undef CPP_SPEC
302 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
303
304-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
305+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-nios2.so.1"
306
307 #undef LINK_SPEC
308 #define LINK_SPEC LINK_SPEC_ENDIAN \
309diff -Naur gcc-7.1.0.orig/gcc/config/pa/pa-linux.h gcc-7.1.0/gcc/config/pa/pa-linux.h
310--- gcc-7.1.0.orig/gcc/config/pa/pa-linux.h 2017-01-01 12:07:43.000000000 +0000
311+++ gcc-7.1.0/gcc/config/pa/pa-linux.h 2017-05-14 03:36:52.533645094 +0000
312@@ -37,7 +37,7 @@
313 /* Define this for shared library support because it isn't in the main
314 linux.h file. */
315
316-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
317+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
318
319 #undef LINK_SPEC
320 #define LINK_SPEC "\
321diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
322--- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h 2017-02-07 11:29:06.000000000 +0000
323+++ gcc-7.1.0/gcc/config/rs6000/linux64.h 2017-05-14 03:36:52.533645094 +0000
324@@ -412,16 +412,16 @@
325 #undef LINK_OS_DEFAULT_SPEC
326 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
327
328-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
329+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
330
331 #ifdef LINUX64_DEFAULT_ABI_ELFv2
332 #define GLIBC_DYNAMIC_LINKER64 \
333-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
334-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
335+"%{mabi=elfv1:/tools/lib64/ld64.so.1;" \
336+":/tools/lib64/ld64.so.2}"
337 #else
338 #define GLIBC_DYNAMIC_LINKER64 \
339-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
340-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
341+"%{mabi=elfv2:/tools/lib64/ld64.so.2;" \
342+":/tools/lib64/ld64.so.1}"
343 #endif
344
345 #define MUSL_DYNAMIC_LINKER32 \
346@@ -429,8 +429,8 @@
347 #define MUSL_DYNAMIC_LINKER64 \
348 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
349
350-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
351-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
352+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
353+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
354 #if DEFAULT_LIBC == LIBC_UCLIBC
355 #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
356 "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
357diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h gcc-7.1.0/gcc/config/rs6000/sysv4.h
358--- gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h 2017-02-07 11:29:06.000000000 +0000
359+++ gcc-7.1.0/gcc/config/rs6000/sysv4.h 2017-05-14 03:36:52.533645094 +0000
360@@ -780,8 +780,8 @@
361
362 #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
363
364-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
365-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
366+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
367+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
368 #define MUSL_DYNAMIC_LINKER \
369 "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
370 #if DEFAULT_LIBC == LIBC_UCLIBC
371diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
372--- gcc-7.1.0.orig/gcc/config/s390/linux.h 2017-02-06 10:25:05.000000000 +0000
373+++ gcc-7.1.0/gcc/config/s390/linux.h 2017-05-14 03:36:52.534645109 +0000
374@@ -73,8 +73,8 @@
375 #define MULTILIB_DEFAULTS { "m31" }
376 #endif
377
378-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
379-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
380+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
381+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
382
383 #undef LINK_SPEC
384 #define LINK_SPEC \
385diff -Naur gcc-7.1.0.orig/gcc/config/sh/linux.h gcc-7.1.0/gcc/config/sh/linux.h
386--- gcc-7.1.0.orig/gcc/config/sh/linux.h 2017-01-01 12:07:43.000000000 +0000
387+++ gcc-7.1.0/gcc/config/sh/linux.h 2017-05-14 03:36:52.534645109 +0000
388@@ -64,7 +64,7 @@
389 "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
390 "%{mfdpic:-fdpic}.so.1"
391
392-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
393+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
394
395 #undef SUBTARGET_LINK_EMUL_SUFFIX
396 #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
397diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
398--- gcc-7.1.0.orig/gcc/config/sparc/linux.h 2017-01-01 12:07:43.000000000 +0000
399+++ gcc-7.1.0/gcc/config/sparc/linux.h 2017-05-14 03:36:52.534645109 +0000
400@@ -83,7 +83,7 @@
401 When the -shared link option is used a final link is not being
402 done. */
403
404-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
405+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
406
407 #undef LINK_SPEC
408 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
409diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
410--- gcc-7.1.0.orig/gcc/config/sparc/linux64.h 2017-01-01 12:07:43.000000000 +0000
411+++ gcc-7.1.0/gcc/config/sparc/linux64.h 2017-05-14 03:36:52.535645123 +0000
412@@ -84,8 +84,8 @@
413 When the -shared link option is used a final link is not being
414 done. */
415
416-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
417-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
418+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
419+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
420
421 #ifdef SPARC_BI_ARCH
422
423@@ -213,7 +213,7 @@
424 #else /* !SPARC_BI_ARCH */
425
426 #undef LINK_SPEC
427-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
428+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
429 %{!shared: \
430 %{!static: \
431 %{rdynamic:-export-dynamic} \
432diff -Naur gcc-7.1.0.orig/gcc/config/xtensa/linux.h gcc-7.1.0/gcc/config/xtensa/linux.h
433--- gcc-7.1.0.orig/gcc/config/xtensa/linux.h 2017-01-01 12:07:43.000000000 +0000
434+++ gcc-7.1.0/gcc/config/xtensa/linux.h 2017-05-14 03:36:52.535645123 +0000
435@@ -46,7 +46,7 @@
436 %{mauto-litpools:--auto-litpools} \
437 %{mno-auto-litpools:--no-auto-litpools}"
438
439-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
440+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
441
442 #undef LINK_SPEC
443 #define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.