source: patches/gcc-7.1.0-specs-1.patch@ 657587d

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

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