diff -urN binutils-2.14.90.0.6/bfd/config.bfd binutils-2.14.90.0.6-uClibc/bfd/config.bfd --- binutils-2.14.90.0.6/bfd/config.bfd 2003-08-21 10:28:47.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/bfd/config.bfd 2004-01-06 23:20:32.000000000 -0600 @@ -121,7 +121,7 @@ targ_defvec=ecoffalpha_little_vec targ_selvecs=bfd_elf64_alpha_vec ;; - alpha*-*-linux-gnu* | alpha*-*-elf*) + alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*) targ_defvec=bfd_elf64_alpha_vec targ_selvecs=ecoffalpha_little_vec ;; @@ -131,7 +131,8 @@ alpha*-*-*) targ_defvec=ecoffalpha_little_vec ;; - ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf*) + ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | \ + ia64*-*-linux-uclibc* | ia64*-*-elf*) targ_defvec=bfd_elf64_ia64_little_vec targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec" ;; @@ -214,7 +215,7 @@ targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; - armeb-*-elf | arm*b-*-linux-gnu*) + armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*) targ_defvec=bfd_elf32_bigarm_vec targ_selvecs=bfd_elf32_littlearm_vec ;; @@ -222,7 +223,8 @@ targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; - arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux*) + arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | \ + arm*-*-conix* | arm*-*-uclinux*) targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; @@ -355,7 +357,7 @@ ;; #ifdef BFD64 - hppa*64*-*-linux-gnu*) + hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*) targ_defvec=bfd_elf64_hppa_linux_vec targ_selvecs=bfd_elf64_hppa_vec ;; @@ -366,7 +368,7 @@ ;; #endif - hppa*-*-linux-gnu*) + hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*) targ_defvec=bfd_elf32_hppa_linux_vec targ_selvecs=bfd_elf32_hppa_vec ;; @@ -488,7 +490,7 @@ targ_selvecs=bfd_elf32_i386_vec targ_underscore=yes ;; - i[3-7]86-*-linux-gnu*) + i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) targ_defvec=bfd_elf32_i386_vec targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec" targ64_selvecs=bfd_elf64_x86_64_vec @@ -502,7 +504,7 @@ targ_defvec=bfd_elf64_x86_64_vec targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec" ;; - x86_64-*-linux-gnu*) + x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*) targ_defvec=bfd_elf64_x86_64_vec targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec" ;; @@ -662,7 +664,7 @@ targ_selvecs=bfd_elf32_m68k_vec targ_underscore=yes ;; - m68*-*-linux-gnu*) + m68*-*-linux-gnu* | m68*-*-linux-uclibc*) targ_defvec=bfd_elf32_m68k_vec targ_selvecs=m68klinux_vec ;; @@ -929,7 +931,8 @@ ;; #endif powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \ - powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \ + powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | \ + powerpc-*-rtems* | \ powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*) targ_defvec=bfd_elf32_powerpc_vec targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec" @@ -961,8 +964,8 @@ targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec" ;; powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \ - powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\ - powerpcle-*-rtems*) + powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* |\ + powerpcle-*-vxworks* | powerpcle-*-rtems*) targ_defvec=bfd_elf32_powerpcle_vec targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec" targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec" @@ -1110,7 +1113,7 @@ targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec" targ_underscore=yes ;; - sparc-*-linux-gnu*) + sparc-*-linux-gnu* | sparc-*-linux-uclibc*) targ_defvec=bfd_elf32_sparc_vec targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec" ;; @@ -1157,7 +1160,7 @@ targ_defvec=sunos_big_vec targ_underscore=yes ;; - sparc64-*-linux-gnu*) + sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*) targ_defvec=bfd_elf64_sparc_vec targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec" ;; diff -urN binutils-2.14.90.0.6/bfd/configure binutils-2.14.90.0.6-uClibc/bfd/configure --- binutils-2.14.90.0.6/bfd/configure 2003-08-21 10:28:47.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/bfd/configure 2004-01-06 20:26:51.000000000 -0600 @@ -1698,6 +1698,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' @@ -5102,7 +5107,7 @@ alpha*-*-freebsd*) COREFILE='' ;; - alpha*-*-linux-gnu*) + alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/alphalinux.h"' ;; @@ -5161,7 +5166,7 @@ COREFILE=trad-core.lo TRAD_HEADER='"hosts/i386mach3.h"' ;; - i[3-7]86-*-linux-gnu*) + i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/i386linux.h"' ;; @@ -5211,7 +5216,7 @@ COREFILE=trad-core.lo TRAD_HEADER='"hosts/hp300bsd.h"' ;; - m68*-*-linux-gnu*) + m68*-*-linux-gnu* | m68*-*-linux-uclibc*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/m68klinux.h"' ;; diff -urN binutils-2.14.90.0.6/bfd/configure.in binutils-2.14.90.0.6-uClibc/bfd/configure.in --- binutils-2.14.90.0.6/bfd/configure.in 2003-08-21 10:28:47.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/bfd/configure.in 2004-01-06 20:33:02.000000000 -0600 @@ -153,7 +153,7 @@ alpha*-*-freebsd*) COREFILE='' ;; - alpha*-*-linux-gnu*) + alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/alphalinux.h"' ;; @@ -233,7 +233,7 @@ TRAD_HEADER='"hosts/i386mach3.h"' ;; changequote(,)dnl - i[3-7]86-*-linux-gnu*) + i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) changequote([,])dnl COREFILE=trad-core.lo TRAD_HEADER='"hosts/i386linux.h"' @@ -286,7 +286,7 @@ COREFILE=trad-core.lo TRAD_HEADER='"hosts/hp300bsd.h"' ;; - m68*-*-linux-gnu*) + m68*-*-linux-gnu* | m68*-*-linux-uclibc*) COREFILE=trad-core.lo TRAD_HEADER='"hosts/m68klinux.h"' ;; diff -urN binutils-2.14.90.0.6/config.sub binutils-2.14.90.0.6-uClibc/config.sub --- binutils-2.14.90.0.6/config.sub 2003-08-21 10:28:47.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/config.sub 2004-01-06 22:56:56.000000000 -0600 @@ -118,7 +118,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-uclibc* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -1131,7 +1131,8 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ diff -urN binutils-2.14.90.0.6/configure binutils-2.14.90.0.6-uClibc/configure --- binutils-2.14.90.0.6/configure 2003-08-21 10:29:32.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/configure 2004-01-07 05:43:40.000000000 -0600 @@ -1257,6 +1262,18 @@ i[3456789]86-*-freebsd*) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; + i[3456789]86-*-linux-uclibc) + # This section makes it possible to build newlib natively on linux. + # If we are using a cross compiler then don't configure newlib. + if test x${is_cross_compiler} != xno ; then + noconfigdirs="$noconfigdirs target-newlib" + fi + noconfigdirs="$noconfigdirs target-libgloss" + # If we are not using a cross compiler, do configure newlib. + # Note however, that newlib will only be configured in this situation + # if the --with-newlib option has been given, because otherwise + # 'target-newlib' will appear in skipdirs. + ;; i[3456789]86-*-linux*) # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's # not build java stuff by default. diff -urN binutils-2.14.90.0.6/configure.in binutils-2.14.90.0.6-uClibc/configure.in --- binutils-2.14.90.0.6/configure.in 2003-08-21 10:29:30.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/configure.in 2004-01-07 05:44:02.000000000 -0600 @@ -508,6 +513,19 @@ i[[3456789]]86-*-freebsd*) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; + i[3456789]86-*-linux-uclibc) + # This section makes it possible to build newlib natively on linux. + # If we are using a cross compiler then don't configure newlib. + if test x${is_cross_compiler} != xno ; then + noconfigdirs="$noconfigdirs target-newlib" + fi + noconfigdirs="$noconfigdirs target-libgloss" + build_modules= + # If we are not using a cross compiler, do configure newlib. + # Note however, that newlib will only be configured in this situation + # if the --with-newlib option has been given, because otherwise + # 'target-newlib' will appear in skipdirs. + ;; i[[3456789]]86-*-linux*) # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's # not build java stuff by default. diff -urN binutils-2.14.90.0.6/demangler/configure binutils-2.14.90.0.6-uClibc/demangler/configure --- binutils-2.14.90.0.6/demangler/configure 2003-08-21 10:29:31.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/demangler/configure 2004-01-06 21:45:51.000000000 -0600 @@ -1363,6 +1363,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -urN binutils-2.14.90.0.6/gas/configure binutils-2.14.90.0.6-uClibc/gas/configure --- binutils-2.14.90.0.6/gas/configure 2003-07-23 10:08:10.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/gas/configure 2004-01-06 21:57:25.000000000 -0600 @@ -1576,6 +1576,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' @@ -2370,6 +2375,7 @@ alpha*-*-osf*) fmt=ecoff ;; alpha*-*-linuxecoff*) fmt=ecoff ;; alpha*-*-linux-gnu*) fmt=elf em=linux ;; + alpha*-*-linux-uclibc*) fmt=elf em=linux ;; alpha*-*-netbsd*) fmt=elf em=nbsd ;; alpha*-*-openbsd*) fmt=elf em=obsd ;; @@ -2386,6 +2392,7 @@ arm*-*-conix*) fmt=elf ;; arm-*-linux*aout*) fmt=aout em=linux ;; arm*-*-linux-gnu*) fmt=elf em=linux ;; + arm*-*-linux-uclibc*) fmt=elf em=linux ;; arm*-*-uclinux*) fmt=elf em=linux ;; arm-*-netbsdelf*) fmt=elf em=nbsd ;; arm-*-*n*bsd*) fmt=aout em=nbsd ;; @@ -2400,6 +2407,7 @@ avr-*-*) fmt=elf ;; cris-*-linux-gnu*) fmt=multi bfd_gas=yes em=linux ;; + cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;; cris-*-*) fmt=multi bfd_gas=yes ;; d10v-*-*) fmt=elf ;; @@ -2455,7 +2463,9 @@ i386-*-linux*oldld) fmt=aout em=linux ;; i386-*-linux*coff*) fmt=coff em=linux ;; i386-*-linux-gnu*) fmt=elf em=linux ;; + i386-*-linux-uclibc*) fmt=elf em=linux ;; x86_64-*-linux-gnu*) fmt=elf em=linux ;; + x86_64-*-linux-uclibc*) fmt=elf em=linux ;; i386-*-lynxos*) fmt=coff em=lynx ;; i386-*-sysv[45]*) fmt=elf ;; i386-*-solaris*) fmt=elf ;; @@ -2512,6 +2522,7 @@ ia64-*-elf*) fmt=elf ;; ia64-*-aix*) fmt=elf em=ia64aix ;; ia64-*-linux-gnu*) fmt=elf em=linux ;; + ia64-*-linux-uclibc*) fmt=elf em=linux ;; ia64-*-hpux*) fmt=elf em=hpux ;; ia64-*-netbsd*) fmt=elf em=nbsd ;; @@ -2538,6 +2549,7 @@ m68k-*-hpux*) fmt=hp300 em=hp300 ;; m68k-*-linux*aout*) fmt=aout em=linux ;; m68k-*-linux-gnu*) fmt=elf em=linux ;; + m68k-*-linux-uclibc*) fmt=elf em=linux ;; m68k-*-gnu*) fmt=elf ;; m68k-*-lynxos*) fmt=coff em=lynx ;; m68k-*-netbsdelf*) fmt=elf em=nbsd ;; @@ -2592,6 +2604,7 @@ ppc-*-beos*) fmt=coff ;; ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;; ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;; + ppc-*-linux-uclibc* | \ ppc-*-linux-gnu*) fmt=elf case "$endian" in big) ;; @@ -2616,7 +2629,9 @@ ppc-*-kaos*) fmt=elf ;; s390x-*-linux-gnu*) fmt=elf em=linux ;; + s390x-*-linux-uclibc*) fmt=elf em=linux ;; s390-*-linux-gnu*) fmt=elf em=linux ;; + s390-*-linux-uclibc*) fmt=elf em=linux ;; sh*-*-linux*) fmt=elf em=linux case ${cpu} in @@ -2649,6 +2664,7 @@ sparc-*-coff) fmt=coff ;; sparc-*-linux*aout*) fmt=aout em=linux ;; sparc-*-linux-gnu*) fmt=elf em=linux ;; + sparc-*-linux-uclibc*) fmt=elf em=linux ;; sparc-*-lynxos*) fmt=coff em=lynx ;; sparc-fujitsu-none) fmt=aout ;; sparc-*-elf) fmt=elf ;; diff -urN binutils-2.14.90.0.6/gas/configure.in binutils-2.14.90.0.6-uClibc/gas/configure.in --- binutils-2.14.90.0.6/gas/configure.in 2003-07-23 10:08:10.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/gas/configure.in 2004-01-06 21:57:26.000000000 -0600 @@ -184,6 +184,7 @@ alpha*-*-osf*) fmt=ecoff ;; alpha*-*-linuxecoff*) fmt=ecoff ;; alpha*-*-linux-gnu*) fmt=elf em=linux ;; + alpha*-*-linux-uclibc*) fmt=elf em=linux ;; alpha*-*-netbsd*) fmt=elf em=nbsd ;; alpha*-*-openbsd*) fmt=elf em=obsd ;; @@ -200,6 +201,7 @@ arm*-*-conix*) fmt=elf ;; arm-*-linux*aout*) fmt=aout em=linux ;; arm*-*-linux-gnu*) fmt=elf em=linux ;; + arm*-*-linux-uclibc*) fmt=elf em=linux ;; arm*-*-uclinux*) fmt=elf em=linux ;; arm-*-netbsdelf*) fmt=elf em=nbsd ;; arm-*-*n*bsd*) fmt=aout em=nbsd ;; @@ -214,6 +216,7 @@ avr-*-*) fmt=elf ;; cris-*-linux-gnu*) fmt=multi bfd_gas=yes em=linux ;; + cris-*-linux-uclibc*) fmt=multi bfd_gas=yes em=linux ;; cris-*-*) fmt=multi bfd_gas=yes ;; d10v-*-*) fmt=elf ;; @@ -269,7 +272,9 @@ i386-*-linux*oldld) fmt=aout em=linux ;; i386-*-linux*coff*) fmt=coff em=linux ;; i386-*-linux-gnu*) fmt=elf em=linux ;; + i386-*-linux-uclibc*) fmt=elf em=linux ;; x86_64-*-linux-gnu*) fmt=elf em=linux ;; + x86_64-*-linux-uclibc*) fmt=elf em=linux ;; i386-*-lynxos*) fmt=coff em=lynx ;; changequote(,)dnl i386-*-sysv[45]*) fmt=elf ;; @@ -322,6 +327,7 @@ ia64-*-elf*) fmt=elf ;; ia64-*-aix*) fmt=elf em=ia64aix ;; ia64-*-linux-gnu*) fmt=elf em=linux ;; + ia64-*-linux-uclibc*) fmt=elf em=linux ;; ia64-*-hpux*) fmt=elf em=hpux ;; ia64-*-netbsd*) fmt=elf em=nbsd ;; @@ -348,6 +354,7 @@ m68k-*-hpux*) fmt=hp300 em=hp300 ;; m68k-*-linux*aout*) fmt=aout em=linux ;; m68k-*-linux-gnu*) fmt=elf em=linux ;; + m68k-*-linux-uclibc*) fmt=elf em=linux ;; m68k-*-gnu*) fmt=elf ;; m68k-*-lynxos*) fmt=coff em=lynx ;; m68k-*-netbsdelf*) fmt=elf em=nbsd ;; @@ -402,6 +409,7 @@ ppc-*-beos*) fmt=coff ;; ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;; ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;; + ppc-*-linux-uclibc* | \ ppc-*-linux-gnu*) fmt=elf case "$endian" in big) ;; @@ -424,7 +432,9 @@ ppc-*-kaos*) fmt=elf ;; s390x-*-linux-gnu*) fmt=elf em=linux ;; + s390x-*-linux-uclibc*) fmt=elf em=linux ;; s390-*-linux-gnu*) fmt=elf em=linux ;; + s390-*-linux-uclibc*) fmt=elf em=linux ;; sh*-*-linux*) fmt=elf em=linux case ${cpu} in @@ -457,6 +467,7 @@ sparc-*-coff) fmt=coff ;; sparc-*-linux*aout*) fmt=aout em=linux ;; sparc-*-linux-gnu*) fmt=elf em=linux ;; + sparc-*-linux-uclibc*) fmt=elf em=linux ;; sparc-*-lynxos*) fmt=coff em=lynx ;; sparc-fujitsu-none) fmt=aout ;; sparc-*-elf) fmt=elf ;; diff -urN binutils-2.14.90.0.6/ld/configure binutils-2.14.90.0.6-uClibc/ld/configure --- binutils-2.14.90.0.6/ld/configure 2003-05-05 16:46:49.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/ld/configure 2004-01-06 21:59:31.000000000 -0600 @@ -1578,6 +1578,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' diff -urN binutils-2.14.90.0.6/ld/configure.tgt binutils-2.14.90.0.6-uClibc/ld/configure.tgt --- binutils-2.14.90.0.6/ld/configure.tgt 2003-08-21 10:28:48.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/ld/configure.tgt 2004-01-06 22:09:40.000000000 -0600 @@ -30,6 +30,7 @@ targ_extra_emuls="criself crislinux" targ_extra_libpath=$targ_extra_emuls ;; cris-*-linux-gnu*) targ_emul=crislinux ;; +cris-*-linux-uclibc*) targ_emul=crislinux ;; cris-*-*) targ_emul=criself targ_extra_emuls="crisaout crislinux" targ_extra_libpath=$targ_extra_emuls ;; @@ -59,14 +60,16 @@ tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'` tdir_sun4=sparc-sun-sunos4 ;; -sparc64-*-linux-gnu*) targ_emul=elf64_sparc +sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*) \ + targ_emul=elf64_sparc targ_extra_emuls="elf32_sparc sparclinux sun4" targ_extra_libpath=elf32_sparc tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` tdir_sparclinux=${tdir_elf32_sparc}aout tdir_sun4=sparc-sun-sunos4 ;; -sparc*-*-linux-gnu*) targ_emul=elf32_sparc +sparc*-*-linux-gnu* | sparc*-*-linux-uclibc*) \ + targ_emul=elf32_sparc targ_extra_emuls="sparclinux elf64_sparc sun4" targ_extra_libpath=elf64_sparc tdir_sparclinux=${targ_alias}aout @@ -124,7 +127,7 @@ m68*-ericsson-ose) targ_emul=sun3 ;; m68*-apple-aux*) targ_emul=m68kaux ;; *-tandem-none) targ_emul=st2000 ;; -i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;; +i370-*-elf* | i370-*-linux-gnu* | i370-*-linux-uclibc*) targ_emul=elf32i370 ;; i[3-7]86-*-nto-qnx*) targ_emul=i386nto ;; i[3-7]86-*-vsta) targ_emul=vsta ;; i[3-7]86-go32-rtems*) targ_emul=i386go32 ;; @@ -148,14 +151,16 @@ tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'` ;; i[3-7]86-*-linux*oldld) targ_emul=i386linux; targ_extra_emuls=elf_i386 ;; -i[3-7]86-*-linux-gnu*) targ_emul=elf_i386 +i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*) \ + targ_emul=elf_i386 targ_extra_emuls=i386linux if test x${want64} = xtrue; then targ_extra_emuls="$targ_extra_emuls elf_x86_64" fi tdir_i386linux=${targ_alias}aout ;; -x86_64-*-linux-gnu*) targ_emul=elf_x86_64 +x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*) \ + targ_emul=elf_x86_64 targ_extra_emuls="elf_i386 i386linux" targ_extra_libpath=elf_i386 tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` @@ -250,10 +255,13 @@ arm9e-*-elf) targ_emul=armelf ;; arm-*-oabi) targ_emul=armelf_oabi ;; arm*b-*-linux-gnu*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;; +arm*b-*-linux-uclibc*) targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;; arm*-*-linux-gnu*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; +arm*-*-linux-uclibc*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; arm*-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; arm*-*-conix*) targ_emul=armelf ;; -thumb-*-linux-gnu* | thumb-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;; +thumb-*-linux-gnu* | thumb-*-linux-uclibc* | thumb-*-uclinux*) \ + targ_emul=armelf_linux; targ_extra_emuls=armelf ;; strongarm-*-coff) targ_emul=armcoff ;; strongarm-*-elf) targ_emul=armelf ;; strongarm-*-kaos*) targ_emul=armelf ;; @@ -354,7 +362,8 @@ targ_extra_emuls=m68kelf tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'` ;; -m68k-*-linux-gnu*) targ_emul=m68kelf +m68k-*-linux-gnu* | m68k-*-linux-uclibc*) \ + targ_emul=m68kelf targ_extra_emuls=m68klinux tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'` ;; @@ -370,9 +379,9 @@ m68*-*-psos*) targ_emul=m68kpsos ;; m68*-*-rtemscoff*) targ_emul=m68kcoff ;; m68*-*-rtems*) targ_emul=m68kelf ;; -hppa*64*-*-linux-gnu*) targ_emul=hppa64linux ;; +hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*) targ_emul=hppa64linux ;; hppa*64*-*) targ_emul=elf64hppa ;; -hppa*-*-linux-gnu*) targ_emul=hppalinux ;; +hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*) targ_emul=hppalinux ;; hppa*-*-*elf*) targ_emul=hppaelf ;; hppa*-*-lites*) targ_emul=hppaelf ;; hppa*-*-netbsd*) targ_emul=hppanbsd ;; @@ -416,16 +425,20 @@ mips*-*-rtems*) targ_emul=elf32ebmip ;; mips*el-*-vxworks*) targ_emul=elf32elmip ;; mips*-*-vxworks*) targ_emul=elf32ebmip ;; -mips64*el-*-linux-gnu*) targ_emul=elf32ltsmipn32 +mips64*el-*-linux-gnu* | mips64*el-*-linux-uclibc*) \ + targ_emul=elf32ltsmipn32 targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" ;; -mips64*-*-linux-gnu*) targ_emul=elf32btsmipn32 +mips64*-*-linux-gnu* | mips64*-*-linux-uclibc*) \ + targ_emul=elf32btsmipn32 targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" ;; -mips*el-*-linux-gnu*) targ_emul=elf32ltsmip +mips*el-*-linux-gnu* | mips*el-*-linux-uclibc*) \ + targ_emul=elf32ltsmip targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" ;; -mips*-*-linux-gnu*) targ_emul=elf32btsmip +mips*-*-linux-gnu* | mips*-*-linux-uclibc*) \ + targ_emul=elf32btsmip targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;; mips*-*-lnews*) targ_emul=mipslnews ;; @@ -447,6 +460,10 @@ alpha*-*-linux-gnu*) targ_emul=elf64alpha targ_extra_emuls=alpha tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'` ;; +alpha*-*-linux-uclibc*) targ_emul=elf64alpha targ_extra_emuls=alpha + # The following needs to be checked... + tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'` + ;; alpha*-*-osf*) targ_emul=alpha ;; alpha*-*-gnu*) targ_emul=elf64alpha ;; alpha*-*-netware*) targ_emul=alpha ;; diff -urN binutils-2.14.90.0.6/libtool.m4 binutils-2.14.90.0.6-uClibc/libtool.m4 --- binutils-2.14.90.0.6/libtool.m4 2003-05-05 16:46:46.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/libtool.m4 2004-01-06 20:30:39.000000000 -0600 @@ -645,6 +645,11 @@ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; +linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` + ;; + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] diff -urN binutils-2.14.90.0.6/ltconfig binutils-2.14.90.0.6-uClibc/ltconfig --- binutils-2.14.90.0.6/ltconfig 2003-07-23 10:08:08.000000000 -0500 +++ binutils-2.14.90.0.6-uClibc/ltconfig 2004-01-06 21:05:11.000000000 -0600 @@ -603,6 +603,7 @@ # Transform linux* to *-*-linux-gnu*, to support old configure scripts. case $host_os in linux-gnu*) ;; +linux-uclibc*) ;; linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` esac @@ -1259,6 +1260,24 @@ dynamic_linker='GNU/Linux ld.so' ;; +linux-uclibc*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + # Note: copied from linux-gnu, and may not be appropriate. + hardcode_into_libs=yes + # Assume using the uClibc dynamic linker. + dynamic_linker="uClibc ld.so" + ;; + netbsd*) need_lib_prefix=no need_version=no