Annotation of /trunk/gcc/patches/gcc-4.2.3-specs.patch
Parent Directory | Revision Log
Revision 691 -
(hide annotations)
(download)
Sat Sep 27 13:09:00 2008 UTC (16 years ago) by niro
File size: 16847 byte(s)
Sat Sep 27 13:09:00 2008 UTC (16 years ago) by niro
File size: 16847 byte(s)
-updated specs patch
1 | niro | 691 | Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) |
2 | Date: 2007-02-14 | ||
3 | Initial Package Version: 4.1.2 | ||
4 | Upstream Status: Not Sent - LFS Specific | ||
5 | Origin: Idea originally developed by Ryan Oliver and Greg Schafer for | ||
6 | the Pure LFS project. | ||
7 | More architectures added by Zack Winkles. | ||
8 | Further fine tunings by Greg Schafer. | ||
9 | Rediffed against gcc 4.0.0 by Robert Connolly. | ||
10 | Rediffed against gcc 4.1.0 by Chris Staub | ||
11 | Rediffed against gcc 4.1.2 by Jim Gifford | ||
12 | Rediffed against gcc 4.2.0 by Joe Ciccone | ||
13 | Description: This patch modifies the location of the dynamic linker for | ||
14 | the GCC Pass 2 build in LFS Chapter 5. | ||
15 | |||
16 | diff -Naur gcc-4.2.0.orig/gcc/config/alpha/gnu.h gcc-4.2.0/gcc/config/alpha/gnu.h | ||
17 | --- gcc-4.2.0.orig/gcc/config/alpha/gnu.h 2007-05-16 19:21:19.000000000 -0400 | ||
18 | +++ gcc-4.2.0/gcc/config/alpha/gnu.h 2007-05-18 16:27:10.000000000 -0400 | ||
19 | @@ -11,7 +11,7 @@ | ||
20 | } while (0) | ||
21 | |||
22 | #undef ELF_DYNAMIC_LINKER | ||
23 | -#define ELF_DYNAMIC_LINKER "/lib/ld.so" | ||
24 | +#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so" | ||
25 | |||
26 | #undef STARTFILE_SPEC | ||
27 | #define STARTFILE_SPEC \ | ||
28 | diff -Naur gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h gcc-4.2.0/gcc/config/alpha/linux-elf.h | ||
29 | --- gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h 2007-05-16 19:21:19.000000000 -0400 | ||
30 | +++ gcc-4.2.0/gcc/config/alpha/linux-elf.h 2007-05-18 16:23:31.000000000 -0400 | ||
31 | @@ -28,8 +28,8 @@ | ||
32 | #define SUBTARGET_EXTRA_SPECS \ | ||
33 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, | ||
34 | |||
35 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
36 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
37 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
38 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" | ||
39 | #if UCLIBC_DEFAULT | ||
40 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" | ||
41 | #else | ||
42 | diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h gcc-4.2.0/gcc/config/arm/linux-eabi.h | ||
43 | --- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h 2007-05-16 19:21:19.000000000 -0400 | ||
44 | +++ gcc-4.2.0/gcc/config/arm/linux-eabi.h 2007-05-18 16:26:45.000000000 -0400 | ||
45 | @@ -53,7 +53,7 @@ | ||
46 | /* Use ld-linux.so.3 so that it will be possible to run "classic" | ||
47 | GNU/Linux binaries on an EABI system. */ | ||
48 | #undef GLIBC_DYNAMIC_LINKER | ||
49 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" | ||
50 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3" | ||
51 | |||
52 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to | ||
53 | use the GNU/Linux version, not the generic BPABI version. */ | ||
54 | diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h | ||
55 | --- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h 2007-05-16 19:21:19.000000000 -0400 | ||
56 | +++ gcc-4.2.0/gcc/config/arm/linux-elf.h 2007-05-18 16:23:31.000000000 -0400 | ||
57 | @@ -51,7 +51,7 @@ | ||
58 | |||
59 | #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" | ||
60 | |||
61 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
62 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
63 | |||
64 | #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \ | ||
65 | %{b} \ | ||
66 | diff -Naur gcc-4.2.0.orig/gcc/config/cris/linux.h gcc-4.2.0/gcc/config/cris/linux.h | ||
67 | --- gcc-4.2.0.orig/gcc/config/cris/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
68 | +++ gcc-4.2.0/gcc/config/cris/linux.h 2007-05-18 16:30:54.000000000 -0400 | ||
69 | @@ -76,7 +76,7 @@ | ||
70 | #undef CRIS_SUBTARGET_VERSION | ||
71 | #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu" | ||
72 | |||
73 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
74 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
75 | |||
76 | /* We need an -rpath-link to ld.so.1, and presumably to each directory | ||
77 | specified with -B. */ | ||
78 | diff -Naur gcc-4.2.0.orig/gcc/config/frv/linux.h gcc-4.2.0/gcc/config/frv/linux.h | ||
79 | --- gcc-4.2.0.orig/gcc/config/frv/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
80 | +++ gcc-4.2.0/gcc/config/frv/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
81 | @@ -36,7 +36,7 @@ | ||
82 | #define ENDFILE_SPEC \ | ||
83 | "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" | ||
84 | |||
85 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
86 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
87 | |||
88 | #undef LINK_SPEC | ||
89 | #define LINK_SPEC "\ | ||
90 | diff -Naur gcc-4.2.0.orig/gcc/config/i386/gnu.h gcc-4.2.0/gcc/config/i386/gnu.h | ||
91 | --- gcc-4.2.0.orig/gcc/config/i386/gnu.h 2007-05-16 19:21:19.000000000 -0400 | ||
92 | +++ gcc-4.2.0/gcc/config/i386/gnu.h 2007-05-18 16:23:31.000000000 -0400 | ||
93 | @@ -22,7 +22,7 @@ | ||
94 | %{!shared: \ | ||
95 | %{!static: \ | ||
96 | %{rdynamic:-export-dynamic} \ | ||
97 | - %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \ | ||
98 | + %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \ | ||
99 | %{static:-static}}" | ||
100 | |||
101 | #undef STARTFILE_SPEC | ||
102 | diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h | ||
103 | --- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 | ||
104 | +++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 16:23:31.000000000 -0400 | ||
105 | @@ -49,8 +49,8 @@ | ||
106 | When the -shared link option is used a final link is not being | ||
107 | done. */ | ||
108 | |||
109 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
110 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | ||
111 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2" | ||
112 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2" | ||
113 | |||
114 | #undef LINK_SPEC | ||
115 | #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ | ||
116 | diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux.h gcc-4.2.0/gcc/config/i386/linux.h | ||
117 | --- gcc-4.2.0.orig/gcc/config/i386/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
118 | +++ gcc-4.2.0/gcc/config/i386/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
119 | @@ -101,7 +101,7 @@ | ||
120 | |||
121 | /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ | ||
122 | #define LINK_EMULATION "elf_i386" | ||
123 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
124 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
125 | |||
126 | #undef SUBTARGET_EXTRA_SPECS | ||
127 | #define SUBTARGET_EXTRA_SPECS \ | ||
128 | diff -Naur gcc-4.2.0.orig/gcc/config/ia64/linux.h gcc-4.2.0/gcc/config/ia64/linux.h | ||
129 | --- gcc-4.2.0.orig/gcc/config/ia64/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
130 | +++ gcc-4.2.0/gcc/config/ia64/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
131 | @@ -37,7 +37,7 @@ | ||
132 | /* Define this for shared library support because it isn't in the main | ||
133 | linux.h file. */ | ||
134 | |||
135 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" | ||
136 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2" | ||
137 | |||
138 | #undef LINK_SPEC | ||
139 | #define LINK_SPEC "\ | ||
140 | diff -Naur gcc-4.2.0.orig/gcc/config/linux.h gcc-4.2.0/gcc/config/linux.h | ||
141 | --- gcc-4.2.0.orig/gcc/config/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
142 | +++ gcc-4.2.0/gcc/config/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
143 | @@ -112,9 +112,9 @@ | ||
144 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or | ||
145 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets | ||
146 | supporting both 32-bit and 64-bit compilation. */ | ||
147 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
148 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
149 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | ||
150 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" | ||
151 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" | ||
152 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" | ||
153 | #define LINUX_DYNAMIC_LINKER \ | ||
154 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) | ||
155 | #define LINUX_DYNAMIC_LINKER32 \ | ||
156 | @@ -127,3 +127,7 @@ | ||
157 | #define TARGET_C99_FUNCTIONS (OPTION_GLIBC) | ||
158 | |||
159 | #define TARGET_POSIX_IO | ||
160 | + | ||
161 | +/* Remove /usr/include from the end of the include search path. */ | ||
162 | +#undef STANDARD_INCLUDE_DIR | ||
163 | +#define STANDARD_INCLUDE_DIR 0 | ||
164 | diff -Naur gcc-4.2.0.orig/gcc/config/m32r/linux.h gcc-4.2.0/gcc/config/m32r/linux.h | ||
165 | --- gcc-4.2.0.orig/gcc/config/m32r/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
166 | +++ gcc-4.2.0/gcc/config/m32r/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
167 | @@ -59,7 +59,7 @@ | ||
168 | |||
169 | /* If ELF is the default format, we should not use /lib/elf. */ | ||
170 | |||
171 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
172 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
173 | |||
174 | #undef LINK_SPEC | ||
175 | #if TARGET_LITTLE_ENDIAN | ||
176 | diff -Naur gcc-4.2.0.orig/gcc/config/m68k/linux.h gcc-4.2.0/gcc/config/m68k/linux.h | ||
177 | --- gcc-4.2.0.orig/gcc/config/m68k/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
178 | +++ gcc-4.2.0/gcc/config/m68k/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
179 | @@ -123,7 +123,7 @@ | ||
180 | |||
181 | /* If ELF is the default format, we should not use /lib/elf. */ | ||
182 | |||
183 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
184 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
185 | |||
186 | #undef LINK_SPEC | ||
187 | #define LINK_SPEC "-m m68kelf %{shared} \ | ||
188 | diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux64.h gcc-4.2.0/gcc/config/mips/linux64.h | ||
189 | --- gcc-4.2.0.orig/gcc/config/mips/linux64.h 2007-05-16 19:21:19.000000000 -0400 | ||
190 | +++ gcc-4.2.0/gcc/config/mips/linux64.h 2007-05-18 16:23:31.000000000 -0400 | ||
191 | @@ -36,10 +36,10 @@ | ||
192 | %{!shared: %{pthread:-lpthread} \ | ||
193 | %{profile:-lc_p} %{!profile: -lc}}" | ||
194 | |||
195 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | ||
196 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" | ||
197 | -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" | ||
198 | -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" | ||
199 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" | ||
200 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1" | ||
201 | +#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1" | ||
202 | +#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0" | ||
203 | #define LINUX_DYNAMIC_LINKERN32 \ | ||
204 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) | ||
205 | |||
206 | diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux.h gcc-4.2.0/gcc/config/mips/linux.h | ||
207 | --- gcc-4.2.0.orig/gcc/config/mips/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
208 | +++ gcc-4.2.0/gcc/config/mips/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
209 | @@ -104,7 +104,7 @@ | ||
210 | #undef MIPS_DEFAULT_GVALUE | ||
211 | #define MIPS_DEFAULT_GVALUE 0 | ||
212 | |||
213 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
214 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
215 | |||
216 | /* Borrowed from sparc/linux.h */ | ||
217 | #undef LINK_SPEC | ||
218 | diff -Naur gcc-4.2.0.orig/gcc/config/mn10300/linux.h gcc-4.2.0/gcc/config/mn10300/linux.h | ||
219 | --- gcc-4.2.0.orig/gcc/config/mn10300/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
220 | +++ gcc-4.2.0/gcc/config/mn10300/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
221 | @@ -33,7 +33,7 @@ | ||
222 | #undef ASM_SPEC | ||
223 | #define ASM_SPEC "%{Wa,*:%*}" | ||
224 | |||
225 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
226 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
227 | |||
228 | #undef LINK_SPEC | ||
229 | #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ | ||
230 | diff -Naur gcc-4.2.0.orig/gcc/config/pa/pa-linux.h gcc-4.2.0/gcc/config/pa/pa-linux.h | ||
231 | --- gcc-4.2.0.orig/gcc/config/pa/pa-linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
232 | +++ gcc-4.2.0/gcc/config/pa/pa-linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
233 | @@ -45,7 +45,7 @@ | ||
234 | /* Define this for shared library support because it isn't in the main | ||
235 | linux.h file. */ | ||
236 | |||
237 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
238 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
239 | |||
240 | #undef LINK_SPEC | ||
241 | #define LINK_SPEC "\ | ||
242 | diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/linux64.h gcc-4.2.0/gcc/config/rs6000/linux64.h | ||
243 | --- gcc-4.2.0.orig/gcc/config/rs6000/linux64.h 2007-05-16 19:21:19.000000000 -0400 | ||
244 | +++ gcc-4.2.0/gcc/config/rs6000/linux64.h 2007-05-18 16:23:31.000000000 -0400 | ||
245 | @@ -336,10 +336,10 @@ | ||
246 | #undef LINK_OS_DEFAULT_SPEC | ||
247 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | ||
248 | |||
249 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | ||
250 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" | ||
251 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
252 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | ||
253 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" | ||
254 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1" | ||
255 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" | ||
256 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" | ||
257 | #if UCLIBC_DEFAULT | ||
258 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" | ||
259 | #else | ||
260 | diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h gcc-4.2.0/gcc/config/rs6000/sysv4.h | ||
261 | --- gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h 2007-05-16 19:21:19.000000000 -0400 | ||
262 | +++ gcc-4.2.0/gcc/config/rs6000/sysv4.h 2007-05-18 16:29:05.000000000 -0400 | ||
263 | @@ -892,8 +892,8 @@ | ||
264 | |||
265 | #define LINK_START_LINUX_SPEC "" | ||
266 | |||
267 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
268 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
269 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
270 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" | ||
271 | #if UCLIBC_DEFAULT | ||
272 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" | ||
273 | #else | ||
274 | @@ -935,7 +935,7 @@ | ||
275 | |||
276 | #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \ | ||
277 | %{rdynamic:-export-dynamic} \ | ||
278 | - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" | ||
279 | + %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}" | ||
280 | |||
281 | #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ | ||
282 | %{!undef: \ | ||
283 | diff -Naur gcc-4.2.0.orig/gcc/config/s390/linux.h gcc-4.2.0/gcc/config/s390/linux.h | ||
284 | --- gcc-4.2.0.orig/gcc/config/s390/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
285 | +++ gcc-4.2.0/gcc/config/s390/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
286 | @@ -73,8 +73,8 @@ | ||
287 | #define MULTILIB_DEFAULTS { "m31" } | ||
288 | #endif | ||
289 | |||
290 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | ||
291 | -#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" | ||
292 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" | ||
293 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" | ||
294 | |||
295 | #undef LINK_SPEC | ||
296 | #define LINK_SPEC \ | ||
297 | diff -Naur gcc-4.2.0.orig/gcc/config/sh/linux.h gcc-4.2.0/gcc/config/sh/linux.h | ||
298 | --- gcc-4.2.0.orig/gcc/config/sh/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
299 | +++ gcc-4.2.0/gcc/config/sh/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
300 | @@ -48,7 +48,7 @@ | ||
301 | |||
302 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack | ||
303 | |||
304 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
305 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
306 | |||
307 | #undef SUBTARGET_LINK_EMUL_SUFFIX | ||
308 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" | ||
309 | diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux64.h gcc-4.2.0/gcc/config/sparc/linux64.h | ||
310 | --- gcc-4.2.0.orig/gcc/config/sparc/linux64.h 2007-05-16 19:21:19.000000000 -0400 | ||
311 | +++ gcc-4.2.0/gcc/config/sparc/linux64.h 2007-05-18 16:25:23.000000000 -0400 | ||
312 | @@ -144,10 +144,10 @@ | ||
313 | |||
314 | /* If ELF is the default format, we should not use /lib/elf. */ | ||
315 | |||
316 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
317 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | ||
318 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
319 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | ||
320 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2" | ||
321 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2" | ||
322 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" | ||
323 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" | ||
324 | #if UCLIBC_DEFAULT | ||
325 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" | ||
326 | #else | ||
327 | @@ -167,7 +167,7 @@ | ||
328 | { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ | ||
329 | { "link_arch", LINK_ARCH_SPEC }, | ||
330 | |||
331 | -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ | ||
332 | +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \ | ||
333 | %{!shared: \ | ||
334 | %{!ibcs: \ | ||
335 | %{!static: \ | ||
336 | @@ -176,7 +176,7 @@ | ||
337 | %{static:-static}}} \ | ||
338 | " | ||
339 | |||
340 | -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ | ||
341 | +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \ | ||
342 | %{!shared: \ | ||
343 | %{!ibcs: \ | ||
344 | %{!static: \ | ||
345 | @@ -257,7 +257,7 @@ | ||
346 | #else /* !SPARC_BI_ARCH */ | ||
347 | |||
348 | #undef LINK_SPEC | ||
349 | -#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ | ||
350 | +#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \ | ||
351 | %{!shared: \ | ||
352 | %{!ibcs: \ | ||
353 | %{!static: \ | ||
354 | diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux.h gcc-4.2.0/gcc/config/sparc/linux.h | ||
355 | --- gcc-4.2.0.orig/gcc/config/sparc/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
356 | +++ gcc-4.2.0/gcc/config/sparc/linux.h 2007-05-18 16:24:24.000000000 -0400 | ||
357 | @@ -121,8 +121,8 @@ | ||
358 | |||
359 | /* If ELF is the default format, we should not use /lib/elf. */ | ||
360 | |||
361 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
362 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
363 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" | ||
364 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" | ||
365 | #if UCLIBC_DEFAULT | ||
366 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" | ||
367 | #else | ||
368 | @@ -133,7 +133,7 @@ | ||
369 | |||
370 | |||
371 | #undef LINK_SPEC | ||
372 | -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ | ||
373 | +#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \ | ||
374 | %{!mno-relax:%{!r:-relax}} \ | ||
375 | %{!shared: \ | ||
376 | %{!ibcs: \ | ||
377 | diff -Naur gcc-4.2.0.orig/gcc/config/xtensa/linux.h gcc-4.2.0/gcc/config/xtensa/linux.h | ||
378 | --- gcc-4.2.0.orig/gcc/config/xtensa/linux.h 2007-05-16 19:21:19.000000000 -0400 | ||
379 | +++ gcc-4.2.0/gcc/config/xtensa/linux.h 2007-05-18 16:23:31.000000000 -0400 | ||
380 | @@ -43,7 +43,7 @@ | ||
381 | %{mlongcalls:--longcalls} \ | ||
382 | %{mno-longcalls:--no-longcalls}" | ||
383 | |||
384 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
385 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" | ||
386 | |||
387 | #undef LINK_SPEC | ||
388 | #define LINK_SPEC \ |