diff -urN binutils-2.15-dist/bfd/config.bfd binutils-2.15/bfd/config.bfd

 --- binutils-2.15-dist/bfd/config.bfd	2004-05-17 14:35:56.000000000 -0500

 +++ binutils-2.15/bfd/config.bfd	2004-08-04 12:01:44.000000000 -0500

 @@ -126,7 +126,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

      ;;

 @@ -136,7 +136,7 @@

    alpha*-*-*)

      targ_defvec=ecoffalpha_little_vec

      ;;

 -  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)

 +  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-linux-uclibc* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)

      targ_defvec=bfd_elf64_ia64_little_vec

      targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"

      ;;

 @@ -213,7 +213,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

      ;;

 @@ -221,7 +221,7 @@

      targ_defvec=bfd_elf32_littlearm_vec

      targ_selvecs=bfd_elf32_bigarm_vec

      ;;

 -  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \

 +  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | arm*-*-conix* | \

    arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)

      targ_defvec=bfd_elf32_littlearm_vec

      targ_selvecs=bfd_elf32_bigarm_vec

 @@ -360,7 +360,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

      ;;

 @@ -371,7 +371,7 @@

      ;;

  #endif

 -  hppa*-*-linux-gnu* | hppa*-*-netbsd*)

 +  hppa*-*-linux-gnu* | hppa*-*-linux-uclibc* | hppa*-*-netbsd*)

      targ_defvec=bfd_elf32_hppa_linux_vec

      targ_selvecs=bfd_elf32_hppa_vec

      ;;

 @@ -494,7 +494,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

 @@ -508,7 +508,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"

      ;;

 @@ -683,7 +683,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

      ;;

 @@ -955,7 +955,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"

 @@ -987,8 +988,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"

 @@ -1149,7 +1150,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"

      ;;

 @@ -1196,7 +1197,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"

      ;;

 @@ -1265,7 +1266,7 @@

      targ_underscore=yes

      ;;

 -  vax-*-linux-gnu*)

 +  vax-*-linux-gnu* | vax-*-linux-uclibc*)

      targ_defvec=bfd_elf32_vax_vec

      ;;

 diff -urN binutils-2.15-dist/bfd/configure binutils-2.15/bfd/configure

 --- binutils-2.15-dist/bfd/configure	2004-05-17 14:35:57.000000000 -0500

 +++ binutils-2.15/bfd/configure	2004-08-04 12:01:44.000000000 -0500

 @@ -1699,6 +1699,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]+$'

 @@ -5278,7 +5283,7 @@

    alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)

  	COREFILE=''

  	;;

 -  alpha*-*-linux-gnu*)

 +  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/alphalinux.h"'

  	;;

 @@ -5338,7 +5343,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"'

  	;;

 @@ -5376,7 +5381,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"'

  	;;

 @@ -5477,7 +5482,7 @@

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/vaxult2.h"'

  	;;

 -  vax-*-linux-gnu*)

 +  vax-*-linux-gnu* | vax-*-linux-uclibc*)

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/vaxlinux.h"'

  	;;

 diff -urN binutils-2.15-dist/bfd/configure.in binutils-2.15/bfd/configure.in

 --- binutils-2.15-dist/bfd/configure.in	2004-05-17 14:35:57.000000000 -0500

 +++ binutils-2.15/bfd/configure.in	2004-08-04 12:01:44.000000000 -0500

 @@ -178,7 +178,7 @@

    alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)

  	COREFILE=''

  	;;

 -  alpha*-*-linux-gnu*)

 +  alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/alphalinux.h"'

  	;;

 @@ -259,7 +259,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"'

 @@ -300,7 +300,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"'

  	;;

 @@ -385,7 +385,7 @@

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/vaxult2.h"'

  	;;

 -  vax-*-linux-gnu*)

 +  vax-*-linux-gnu* | vax-*-linux-uclibc*)

  	COREFILE=trad-core.lo

  	TRAD_HEADER='"hosts/vaxlinux.h"'

  	;;

 diff -urN binutils-2.15-dist/binutils/configure binutils-2.15/binutils/configure

 --- binutils-2.15-dist/binutils/configure	2004-01-02 11:08:04.000000000 -0600

 +++ binutils-2.15/binutils/configure	2004-08-04 12:01:44.000000000 -0500

 @@ -1585,6 +1585,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.15-dist/configure binutils-2.15/configure

 --- binutils-2.15-dist/configure	2004-05-17 14:36:20.000000000 -0500

 +++ binutils-2.15/configure	2004-08-04 12:01:44.000000000 -0500

 @@ -1288,6 +1288,18 @@

    i[3456789]86-*-freebsd* | i[3456789]86-*-kfreebsd*-gnu)

      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.15-dist/configure.in binutils-2.15/configure.in

 --- binutils-2.15-dist/configure.in	2004-05-17 14:40:54.000000000 -0500

 +++ binutils-2.15/configure.in	2004-08-04 12:01:44.000000000 -0500

 @@ -521,6 +521,18 @@

    i[[3456789]]86-*-freebsd* | i[[3456789]]86-*-kfreebsd*-gnu)

      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.15-dist/gas/configure binutils-2.15/gas/configure

 --- binutils-2.15-dist/gas/configure	2004-05-17 14:36:07.000000000 -0500

 +++ binutils-2.15/gas/configure	2004-08-04 12:07:50.000000000 -0500

 @@ -3400,6 +3400,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]+$'

 @@ -4224,6 +4229,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 ;;

 @@ -4240,6 +4246,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 ;;

 @@ -4253,6 +4260,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 ;;

 @@ -4310,7 +4318,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 ;;

 @@ -4370,6 +4380,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 ;;

 @@ -4397,6 +4408,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-*-uclinux*)			fmt=elf ;;

        m68k-*-gnu*)			fmt=elf ;;

        m68k-*-lynxos*)			fmt=coff em=lynx ;;

 @@ -4459,6 +4471,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 em=linux

  	    case "$endian" in

  		big)  ;;

 @@ -4486,7 +4499,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

 @@ -4519,6 +4534,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.15-dist/gas/configure.in binutils-2.15/gas/configure.in

 --- binutils-2.15-dist/gas/configure.in	2004-05-17 14:36:07.000000000 -0500

 +++ binutils-2.15/gas/configure.in	2004-08-04 12:07:21.000000000 -0500

 @@ -194,6 +194,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 ;;

 @@ -210,6 +211,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 ;;

 @@ -223,6 +225,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 ;;

 @@ -280,7 +283,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 ;;

 @@ -333,6 +338,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 ;;

 @@ -360,6 +366,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-*-uclinux*)			fmt=elf ;;

        m68k-*-gnu*)			fmt=elf ;;

        m68k-*-lynxos*)			fmt=coff em=lynx ;;

 @@ -419,6 +426,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 em=linux

  	    case "$endian" in

  		big)  ;;

 @@ -439,7 +447,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

 @@ -472,6 +482,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.15-dist/gprof/configure binutils-2.15/gprof/configure

 --- binutils-2.15-dist/gprof/configure	2003-08-26 12:19:19.000000000 -0500

 +++ binutils-2.15/gprof/configure	2004-08-04 12:01:45.000000000 -0500

 @@ -1581,6 +1581,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.15-dist/ld/configure binutils-2.15/ld/configure

 --- binutils-2.15-dist/ld/configure	2003-04-24 07:36:07.000000000 -0500

 +++ binutils-2.15/ld/configure	2004-08-04 12:01:45.000000000 -0500

 @@ -1589,6 +1589,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.15-dist/ld/configure.tgt binutils-2.15/ld/configure.tgt

 --- binutils-2.15-dist/ld/configure.tgt	2004-05-17 14:36:15.000000000 -0500

 +++ binutils-2.15/ld/configure.tgt	2004-08-04 12:01:45.000000000 -0500

 @@ -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

 @@ -118,7 +121,9 @@

  m32r*le-*-elf*)         targ_emul=m32rlelf ;;

  m32r*-*-elf*)           targ_emul=m32relf ;;

  m32r*le-*-linux-gnu*)   targ_emul=m32rlelf_linux ;;

 +m32r*le-*-linux-uclibc*) targ_emul=m32rlelf_linux ;;

  m32r*-*-linux-gnu*)     targ_emul=m32relf_linux ;;

 +m32r*-*-linux-uclibc*)  targ_emul=m32relf_linux ;;

  m68hc11-*-*|m6811-*-*)	targ_emul=m68hc11elf 

  			targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;

  m68hc12-*-*|m6812-*-*)	targ_emul=m68hc12elf 

 @@ -128,7 +133,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 ;;

 @@ -152,14 +157,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/'`

 @@ -259,10 +266,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 ;;

 @@ -364,7 +374,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/'`

  			;;

 @@ -381,9 +392,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 ;;

 @@ -396,6 +407,7 @@

  			targ_emul=vaxnbsd

  			targ_extra_emuls=elf32vax ;;

  vax-*-linux-gnu*)	targ_emul=elf32vax ;;

 +vax-*-linux-uclibc*)	targ_emul=elf32vax ;;

  mips*-*-pe)		targ_emul=mipspe ;

  			targ_extra_ofiles="deffilep.o pe-dll.o" ;;

  mips*-dec-ultrix*)	targ_emul=mipslit ;;

 @@ -429,16 +441,16 @@

  mips*-*-vxworks*)	targ_emul=elf32ebmip

  		        targ_extra_emuls="elf32elmip" ;;

  mips*-*-windiss)	targ_emul=elf32mipswindiss ;;

 -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 ;;

 @@ -461,6 +473,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.15-dist/libtool.m4 binutils-2.15/libtool.m4

 --- binutils-2.15-dist/libtool.m4	2003-04-10 22:58:39.000000000 -0500

 +++ binutils-2.15/libtool.m4	2004-08-04 12:01:45.000000000 -0500

 @@ -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.15-dist/ltconfig binutils-2.15/ltconfig

 --- binutils-2.15-dist/ltconfig	2003-10-03 23:54:47.000000000 -0500

 +++ binutils-2.15/ltconfig	2004-08-04 12:01:45.000000000 -0500

 @@ -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

 diff -urN binutils-2.15-dist/opcodes/configure binutils-2.15/opcodes/configure

 --- binutils-2.15-dist/opcodes/configure	2003-08-05 04:39:31.000000000 -0500

 +++ binutils-2.15/opcodes/configure	2004-08-04 12:01:45.000000000 -0500

 @@ -1700,6 +1700,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]+$'