| blob | 00ea4eeb5714ae452d09ebce3b68c2c28e946c59 |
1 --- gcc-3.4.1/gcc/config/t-linux-uclibc
2 +++ gcc-3.4.1/gcc/config/t-linux-uclibc
3 @@ -0,0 +1,5 @@
4 +# Remove glibc specific files added in t-linux
5 +SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
6 +
7 +# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
8 +LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
9 --- gcc-3.4.1/gcc/config.gcc
10 +++ gcc-3.4.1/gcc/config.gcc
11 @@ -2310,10 +2310,16 @@
12 *)
13 echo "*** Configuration ${target} not supported" 1>&2
14 exit 1
15 ;;
16 esac
17 +
18 +# Rather than hook into each target, just do it after all the linux
19 +# targets have been processed
20 +case ${target} in
21 +*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
22 +esac
24 # Support for --with-cpu and related options (and a few unrelated options,
25 # too).
26 case ${with_cpu} in
27 yes | no)
28 --- gcc-3.4.4/gcc/config/alpha/linux-elf.h
29 +++ gcc-3.4.4/gcc/config/alpha/linux-elf.h
30 @@ -27,7 +27,11 @@
31 #define SUBTARGET_EXTRA_SPECS \
32 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
34 +#ifdef USE_UCLIBC
35 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
36 +#else
37 #define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
38 +#endif
40 #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
41 %{O*:-O3} %{!O*:-O1} \
42 --- gcc-3.4.1-dist/gcc/config/arm/linux-elf.h 2004-01-31 00:18:11.000000000 -0600
43 +++ gcc-3.4.1/gcc/config/arm/linux-elf.h 2004-08-12 15:54:42.000000000 -0500
44 @@ -80,14 +80,19 @@
45 #define ENDFILE_SPEC \
46 "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
48 +#ifdef USE_UCLIBC
49 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
50 +#else
51 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
52 +#endif
53 #undef LINK_SPEC
54 #define LINK_SPEC "%{h*} %{version:-v} \
55 %{b} %{Wl,*:%*} \
56 %{static:-Bstatic} \
57 %{shared:-shared} \
58 %{symbolic:-Bsymbolic} \
59 %{rdynamic:-export-dynamic} \
60 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
61 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
62 -X \
63 %{mbig-endian:-EB}" \
64 SUBTARGET_EXTRA_LINK_SPEC
65 --- gcc-3.4.1-dist/gcc/config/cris/linux.h 2003-11-28 21:08:09.000000000 -0600
66 +++ gcc-3.4.1/gcc/config/cris/linux.h 2004-08-12 15:54:43.000000000 -0500
67 @@ -79,6 +79,25 @@
68 #undef CRIS_DEFAULT_CPU_VERSION
69 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
71 +#ifdef USE_UCLIBC
72 +
73 +#undef CRIS_SUBTARGET_VERSION
74 +#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
75 +
76 +#undef CRIS_LINK_SUBTARGET_SPEC
77 +#define CRIS_LINK_SUBTARGET_SPEC \
78 + "-mcrislinux\
79 + -rpath-link include/asm/../..%s\
80 + %{shared} %{static}\
81 + %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
82 + %{!shared: \
83 + %{!static: \
84 + %{rdynamic:-export-dynamic} \
85 + %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
86 + %{!r:%{O2|O3: --gc-sections}}"
87 +
88 +#else /* USE_UCLIBC */
89 +
90 #undef CRIS_SUBTARGET_VERSION
91 #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
93 @@ -93,6 +112,8 @@
94 %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
95 %{!r:%{O2|O3: --gc-sections}}"
97 +#endif /* USE_UCLIBC */
98 +
100 /* Node: Run-time Target */
102 --- gcc-3.4.1-dist/gcc/config/i386/linux.h 2003-11-28 21:08:10.000000000 -0600
103 +++ gcc-3.4.1/gcc/config/i386/linux.h 2004-08-12 15:54:43.000000000 -0500
104 @@ -110,22 +110,21 @@
106 #undef LINK_SPEC
107 #ifdef USE_GNULIBC_1
108 -#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
109 - %{!shared: \
110 - %{!ibcs: \
111 - %{!static: \
112 - %{rdynamic:-export-dynamic} \
113 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
114 - %{static:-static}}}"
115 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.1"
116 +#else
117 +#ifdef USE_UCLIBC
118 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
119 #else
120 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
121 +#endif
122 +#endif
123 #define LINK_SPEC "-m elf_i386 %{shared:-shared} \
124 %{!shared: \
125 %{!ibcs: \
126 %{!static: \
127 %{rdynamic:-export-dynamic} \
128 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
129 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
130 %{static:-static}}}"
131 -#endif
133 /* A C statement (sans semicolon) to output to the stdio stream
134 FILE the assembler definition of uninitialized global DECL named
135 --- gcc-3.4.4/gcc/config/i386/linux64.h
136 +++ gcc-3.4.4/gcc/config/i386/linux64.h
137 @@ -54,14 +54,21 @@
138 When the -shared link option is used a final link is not being
139 done. */
141 +#ifdef USE_UCLIBC
142 +#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
143 +#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
144 +#else
145 +#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
146 +#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
147 +#endif
148 #undef LINK_SPEC
149 #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
150 %{shared:-shared} \
151 %{!shared: \
152 %{!static: \
153 %{rdynamic:-export-dynamic} \
154 - %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
155 - %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
156 + %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
157 + %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
158 %{static:-static}}"
160 #define MULTILIB_DEFAULTS { "m64" }
161 --- gcc-3.4.4/gcc/config/ia64/linux.h
162 +++ gcc-3.4.4/gcc/config/ia64/linux.h
163 @@ -37,13 +37,18 @@
164 /* Define this for shared library support because it isn't in the main
165 linux.h file. */
167 +#ifdef USE_UCLIBC
168 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
169 +#else
170 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
171 +#endif
172 #undef LINK_SPEC
173 #define LINK_SPEC "\
174 %{shared:-shared} \
175 %{!shared: \
176 %{!static: \
177 %{rdynamic:-export-dynamic} \
178 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
179 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
180 %{static:-static}}"
183 --- gcc-3.4.4/gcc/config/m68k/linux.h
184 +++ gcc-3.4.4/gcc/config/m68k/linux.h
185 @@ -131,12 +131,17 @@
187 /* If ELF is the default format, we should not use /lib/elf. */
189 +#ifdef USE_UCLIBC
190 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
191 +#else
192 +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
193 +#endif
194 #undef LINK_SPEC
195 #define LINK_SPEC "-m m68kelf %{shared} \
196 %{!shared: \
197 %{!static: \
198 %{rdynamic:-export-dynamic} \
199 - %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
200 + %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
201 %{static}}"
203 /* For compatibility with linux/a.out */
204 --- gcc-3.4.1-dist/gcc/config/mips/linux.h 2004-06-15 20:42:24.000000000 -0500
205 +++ gcc-3.4.1/gcc/config/mips/linux.h 2004-08-12 15:54:43.000000000 -0500
206 @@ -109,14 +109,19 @@
208 /* Borrowed from sparc/linux.h */
209 #undef LINK_SPEC
210 +#ifdef USE_UCLIBC
211 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
212 +#else
213 +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
214 +#endif
215 #define LINK_SPEC \
216 "%(endian_spec) \
217 %{shared:-shared} \
218 %{!shared: \
219 %{!ibcs: \
220 %{!static: \
221 %{rdynamic:-export-dynamic} \
222 - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
223 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
224 %{static:-static}}}"
226 #undef SUBTARGET_ASM_SPEC
227 --- gcc-3.4.4/gcc/config/pa/pa-linux.h
228 +++ gcc-3.4.4/gcc/config/pa/pa-linux.h
229 @@ -77,13 +77,18 @@
230 /* Define this for shared library support because it isn't in the main
231 linux.h file. */
233 +#ifdef USE_UCLIBC
234 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
235 +#else
236 +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
237 +#endif
238 #undef LINK_SPEC
239 #define LINK_SPEC "\
240 %{shared:-shared} \
241 %{!shared: \
242 %{!static: \
243 %{rdynamic:-export-dynamic} \
244 - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
245 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
246 %{static:-static}}"
248 /* glibc's profiling functions don't need gcc to allocate counters. */
249 --- gcc-3.4.1-dist/gcc/config/rs6000/linux.h 2004-02-25 09:11:19.000000000 -0600
250 +++ gcc-3.4.1/gcc/config/rs6000/linux.h 2004-08-12 15:54:43.000000000 -0500
251 @@ -69,7 +69,11 @@
252 #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
254 #undef LINK_OS_DEFAULT_SPEC
255 +#ifdef USE_UCLIBC
256 +#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
257 +#else
258 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
259 +#endif
261 #define LINK_GCC_C_SEQUENCE_SPEC \
262 "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
263 --- gcc-3.4.1-dist/gcc/config/rs6000/sysv4.h 2004-06-10 01:39:50.000000000 -0500
264 +++ gcc-3.4.1/gcc/config/rs6000/sysv4.h 2004-08-12 15:54:43.000000000 -0500
265 @@ -947,6 +947,7 @@
266 mcall-linux : %(link_os_linux) ; \
267 mcall-gnu : %(link_os_gnu) ; \
268 mcall-netbsd : %(link_os_netbsd) ; \
269 + mcall-linux-uclibc : %(link_os_linux_uclibc); \
270 mcall-openbsd: %(link_os_openbsd) ; \
271 : %(link_os_default) }"
273 @@ -1125,6 +1126,10 @@
274 %{rdynamic:-export-dynamic} \
275 %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
277 +#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
278 + %{rdynamic:-export-dynamic} \
279 + %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
280 +
281 #if defined(HAVE_LD_EH_FRAME_HDR)
282 # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
283 #endif
284 @@ -1291,6 +1296,7 @@
285 { "link_os_sim", LINK_OS_SIM_SPEC }, \
286 { "link_os_freebsd", LINK_OS_FREEBSD_SPEC }, \
287 { "link_os_linux", LINK_OS_LINUX_SPEC }, \
288 + { "link_os_linux_uclibc", LINK_OS_LINUX_UCLIBC_SPEC }, \
289 { "link_os_gnu", LINK_OS_GNU_SPEC }, \
290 { "link_os_netbsd", LINK_OS_NETBSD_SPEC }, \
291 { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
292 --- gcc-3.4.4/gcc/config/s390/linux.h
293 +++ gcc-3.4.4/gcc/config/s390/linux.h
294 @@ -77,6 +77,13 @@
295 #define MULTILIB_DEFAULTS { "m31" }
296 #endif
298 +#ifdef USE_UCLIBC
299 +#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
300 +#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
301 +#else
302 +#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
303 +#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
304 +#endif
305 #undef LINK_SPEC
306 #define LINK_SPEC \
307 "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
308 @@ -86,8 +93,8 @@
309 %{!static: \
310 %{rdynamic:-export-dynamic} \
311 %{!dynamic-linker: \
312 - %{m31:-dynamic-linker /lib/ld.so.1} \
313 - %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
314 + %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
315 + %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
318 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
319 --- gcc-3.4.1-dist/gcc/config/sh/linux.h 2004-01-11 20:29:13.000000000 -0600
320 +++ gcc-3.4.1/gcc/config/sh/linux.h 2004-08-12 15:54:43.000000000 -0500
321 @@ -73,11 +73,16 @@
322 #undef SUBTARGET_LINK_EMUL_SUFFIX
323 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
324 #undef SUBTARGET_LINK_SPEC
325 +#ifdef USE_UCLIBC
326 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
327 +#else
328 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
329 +#endif
330 #define SUBTARGET_LINK_SPEC \
331 "%{shared:-shared} \
332 %{!static: \
333 %{rdynamic:-export-dynamic} \
334 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
335 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
336 %{static:-static}"
338 #undef LIB_SPEC
339 --- gcc-3.4.4/gcc/config/sparc/linux.h
340 +++ gcc-3.4.4/gcc/config/sparc/linux.h
341 @@ -162,13 +162,18 @@
342 %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
343 %{static:-static}}}"
344 #else
345 +#ifdef USE_UCLIBC
346 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
347 +#else
348 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
349 +#endif
350 #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
351 %{!mno-relax:%{!r:-relax}} \
352 %{!shared: \
353 %{!ibcs: \
354 %{!static: \
355 %{rdynamic:-export-dynamic} \
356 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
357 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
358 %{static:-static}}}"
359 #endif
361 --- gcc-3.4.4/gcc/config/sparc/linux64.h
362 +++ gcc-3.4.4/gcc/config/sparc/linux64.h
363 @@ -167,12 +166,17 @@
364 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
365 { "link_arch", LINK_ARCH_SPEC },
367 +#ifdef USE_UCLIBC
368 +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
369 +#else
370 +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
371 +#endif
372 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
373 %{!shared: \
374 %{!ibcs: \
375 %{!static: \
376 %{rdynamic:-export-dynamic} \
377 - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
378 + %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
379 %{static:-static}}} \
380 "
382 --- gcc-3.4.1-dist/libtool.m4 2004-05-18 04:08:37.000000000 -0500
383 +++ gcc-3.4.1/libtool.m4 2004-08-12 15:54:43.000000000 -0500
384 @@ -689,6 +689,11 @@
385 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
386 ;;
388 +linux-uclibc*)
389 + lt_cv_deplibs_check_method=pass_all
390 + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
391 + ;;
392 +
393 netbsd*)
394 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
395 [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
396 --- gcc-3.4.1-dist/ltconfig 2004-03-05 15:05:41.000000000 -0600
397 +++ gcc-3.4.1/ltconfig 2004-08-12 15:55:48.000000000 -0500
398 @@ -602,6 +602,7 @@
400 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
401 case $host_os in
402 +linux-uclibc*) ;;
403 linux-gnu*) ;;
404 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
405 esac
406 @@ -1262,6 +1263,24 @@
407 dynamic_linker='GNU/Linux ld.so'
408 ;;
410 +linux-uclibc*)
411 + version_type=linux
412 + need_lib_prefix=no
413 + need_version=no
414 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
415 + soname_spec='${libname}${release}.so$major'
416 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
417 + shlibpath_var=LD_LIBRARY_PATH
418 + shlibpath_overrides_runpath=no
419 + # This implies no fast_install, which is unacceptable.
420 + # Some rework will be needed to allow for fast_install
421 + # before this can be enabled.
422 + # Note: copied from linux-gnu, and may not be appropriate.
423 + hardcode_into_libs=yes
424 + # Assume using the uClibc dynamic linker.
425 + dynamic_linker="uClibc ld.so"
426 + ;;
427 +
428 netbsd*)
429 need_lib_prefix=no
430 need_version=no
431 --- gcc-3.4.1-dist/boehm-gc/configure 2004-07-01 14:14:03.000000000 -0500
432 +++ gcc-3.4.1/boehm-gc/configure 2004-08-12 16:22:57.000000000 -0500
433 @@ -1947,6 +1947,11 @@
434 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
435 ;;
437 +linux-uclibc*)
438 + lt_cv_deplibs_check_method=pass_all
439 + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
440 + ;;
441 +
442 netbsd*)
443 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
444 lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
445 --- gcc-3.4.1-dist/boehm-gc/ltconfig 2002-11-20 09:59:06.000000000 -0600
446 +++ gcc-3.4.1/boehm-gc/ltconfig 2004-08-12 15:54:42.000000000 -0500
447 @@ -1981,6 +1981,23 @@
448 fi
449 ;;
451 +linux-uclibc*)
452 + version_type=linux
453 + need_lib_prefix=no
454 + need_version=no
455 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
456 + soname_spec='${libname}${release}.so$major'
457 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
458 + shlibpath_var=LD_LIBRARY_PATH
459 + shlibpath_overrides_runpath=no
460 + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
461 + file_magic_cmd=/usr/bin/file
462 + file_magic_test_file=`echo /lib/libuClibc-*.so`
463 +
464 + # Assume using the uClibc dynamic linker.
465 + dynamic_linker="uClibc ld.so"
466 + ;;
467 +
468 netbsd*)
469 version_type=sunos
470 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then