diff -uNr binutils-2.13.2.1.org/bfd/configure binutils-2.13.2.1/bfd/configure
--- binutils-2.13.2.1.org/bfd/configure	2003-01-02 02:23:03.000000000 +0100
+++ binutils-2.13.2.1/bfd/configure	2005-02-16 23:00:44.042810464 +0100
@@ -1677,6 +1677,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 -uNr binutils-2.13.2.1.org/config.sub binutils-2.13.2.1/config.sub
--- binutils-2.13.2.1.org/config.sub	2002-07-14 03:14:52.000000000 +0200
+++ binutils-2.13.2.1/config.sub	2005-02-16 22:58:22.251366040 +0100
@@ -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* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-uclibc* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -1085,7 +1085,7 @@
 	      | -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* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
diff -uNr binutils-2.13.2.1.org/gas/configure binutils-2.13.2.1/gas/configure
--- binutils-2.13.2.1.org/gas/configure	2002-10-30 18:07:37.000000000 +0100
+++ binutils-2.13.2.1/gas/configure	2005-02-16 23:01:33.837240560 +0100
@@ -1554,6 +1554,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 -uNr binutils-2.13.2.1.org/ld/configure binutils-2.13.2.1/ld/configure
--- binutils-2.13.2.1.org/ld/configure	2002-07-14 03:14:44.000000000 +0200
+++ binutils-2.13.2.1/ld/configure	2005-02-16 23:02:21.460000800 +0100
@@ -1552,6 +1552,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 -uNr binutils-2.13.2.1.org/ld/configure.tgt binutils-2.13.2.1/ld/configure.tgt
--- binutils-2.13.2.1.org/ld/configure.tgt	2002-10-28 16:58:12.000000000 +0100
+++ binutils-2.13.2.1/ld/configure.tgt	2005-02-16 23:03:29.906595336 +0100
@@ -388,9 +388,11 @@
 mips*-*-rtems*)		targ_emul=elf32ebmip ;;
 mips*el-*-vxworks*)	targ_emul=elf32elmip ;;
 mips*-*-vxworks*)	targ_emul=elf32ebmip ;;
+mips*el-*-linux-uclibc | \
 mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
 			targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
 			;;
+mips*-*-linux-uclibc | \
 mips*-*-linux-gnu*)	targ_emul=elf32btsmip
 			targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip"
 			;;
diff -uNr binutils-2.13.2.1.org/libtool.m4 binutils-2.13.2.1/libtool.m4
--- binutils-2.13.2.1.org/libtool.m4	2002-01-28 05:59:30.000000000 +0100
+++ binutils-2.13.2.1/libtool.m4	2005-02-16 23:04:07.106940024 +0100
@@ -631,6 +631,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 -uNr binutils-2.13.2.1.org/ltconfig binutils-2.13.2.1/ltconfig
--- binutils-2.13.2.1.org/ltconfig	2002-01-28 05:59:30.000000000 +0100
+++ binutils-2.13.2.1/ltconfig	2005-02-16 23:05:24.156226752 +0100
@@ -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
 
@@ -1239,6 +1240,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