remove some old binutils versions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2211 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2005-10-21 17:30:24 +0000
committer: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2005-10-21 17:30:24 +0000
commit: f4b98ea359bc59f1d3c56fbef2ad942eb6bf557b (patch)
tree: 9aa3f32e945047430c55bdfb1bea937cba7be1ed /openwrt/toolchain/binutils
parent: e792a6d076dd25b2b85f37b859bf2cc362429694 (diff)
22 files changed, 0 insertions, 3892 deletions
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/100-uclibc-conf.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/100-uclibc-conf.patch
deleted file mode 100644
index dc21386f42..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/100-uclibc-conf.patch
+++ /dev/null
@@ -1,749 +0,0 @@
-diff -ur binutils-2.15.94.0.2.orig/bfd/config.bfd binutils-2.15.94.0.2/bfd/config.bfd
---- binutils-2.15.94.0.2.orig/bfd/config.bfd	2004-12-22 15:00:57.219024360 -0500
-+++ binutils-2.15.94.0.2/bfd/config.bfd	2004-12-22 15:01:18.982715776 -0500
-@@ -140,7 +140,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
-     ;;
-@@ -150,7 +150,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"
-     ;;
-@@ -227,7 +227,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
-     ;;
-@@ -235,8 +235,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-*-kfreebsd*-gnu | arm-*-vxworks | \
-+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | \
-+  arm*-*-conix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks | \
-   arm*-*-eabi* )
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-@@ -381,7 +381,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
-     ;;
-@@ -392,7 +392,7 @@
-     ;;
- #endif
- 
--  hppa*-*-linux-gnu*)
-+  hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_hppa_linux_vec
-     targ_selvecs=bfd_elf32_hppa_vec
-     ;;
-@@ -525,7 +525,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
-@@ -539,7 +539,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"
-     ;;
-@@ -715,7 +715,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
-     ;;
-@@ -1001,7 +1001,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"
-@@ -1038,8 +1039,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"
-@@ -1209,7 +1210,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"
-     ;;
-@@ -1256,7 +1257,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"
-     ;;
-@@ -1325,7 +1326,7 @@
-     targ_underscore=yes
-     ;;
- 
--  vax-*-linux-gnu*)
-+  vax-*-linux-gnu* | vax-*-linux-uclibc*)
-     targ_defvec=bfd_elf32_vax_vec
-     ;;
- 
-diff -ur binutils-2.15.94.0.2.orig/bfd/configure binutils-2.15.94.0.2/bfd/configure
---- binutils-2.15.94.0.2.orig/bfd/configure	2004-12-22 15:00:57.221024056 -0500
-+++ binutils-2.15.94.0.2/bfd/configure	2004-12-22 15:01:18.996713648 -0500
-@@ -3583,6 +3583,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -9914,7 +9919,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"'
- 	;;
-@@ -9978,7 +9983,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"'
- 	;;
-@@ -10016,7 +10021,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"'
- 	;;
-@@ -10150,7 +10155,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 -ur binutils-2.15.94.0.2.orig/bfd/configure.in binutils-2.15.94.0.2/bfd/configure.in
---- binutils-2.15.94.0.2.orig/bfd/configure.in	2004-12-22 15:00:57.223023752 -0500
-+++ binutils-2.15.94.0.2/bfd/configure.in	2004-12-22 15:01:18.998713344 -0500
-@@ -163,7 +163,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"'
- 	;;
-@@ -248,7 +248,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"'
-@@ -289,7 +289,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"'
- 	;;
-@@ -375,7 +375,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 -ur binutils-2.15.94.0.2.orig/binutils/configure binutils-2.15.94.0.2/binutils/configure
---- binutils-2.15.94.0.2.orig/binutils/configure	2004-12-22 15:00:57.351004296 -0500
-+++ binutils-2.15.94.0.2/binutils/configure	2004-12-22 15:01:19.002712736 -0500
-@@ -1575,6 +1575,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -ur binutils-2.15.94.0.2.orig/configure binutils-2.15.94.0.2/configure
---- binutils-2.15.94.0.2.orig/configure	2004-12-22 15:00:57.321008856 -0500
-+++ binutils-2.15.94.0.2/configure	2004-12-22 15:01:19.007711976 -0500
-@@ -1352,6 +1352,18 @@
-   i[3456789]86-*-coff | i[3456789]86-*-elf)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  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 -ur binutils-2.15.94.0.2.orig/configure.in binutils-2.15.94.0.2/configure.in
---- binutils-2.15.94.0.2.orig/configure.in	2004-12-22 15:00:57.321008856 -0500
-+++ binutils-2.15.94.0.2/configure.in	2004-12-22 15:01:19.010711520 -0500
-@@ -561,6 +561,18 @@
-   i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  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 -ur binutils-2.15.94.0.2.orig/gas/configure binutils-2.15.94.0.2/gas/configure
---- binutils-2.15.94.0.2.orig/gas/configure	2004-12-22 15:00:57.461987424 -0500
-+++ binutils-2.15.94.0.2/gas/configure	2004-12-22 15:01:19.019710152 -0500
-@@ -3420,6 +3420,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -4256,6 +4261,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 ;;
- 
-@@ -4272,6 +4278,7 @@
-       arm-*-linux*aout*)		fmt=aout em=linux ;;
-       arm*-*-linux-gnueabi*)		fmt=elf  em=armlinuxeabi ;;
-       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 ;;
-@@ -4285,6 +4292,7 @@
- 
-       cris-*-linux-gnu* | crisv32-*-linux-gnu*)
- 					fmt=multi bfd_gas=yes em=linux ;;
-+      cris-*-linux-uclibc*)		fmt=multi bfd_gas=yes em=linux ;;
-       cris-*-* | crisv32-*-*)		fmt=multi bfd_gas=yes ;;
- 
-       crx-*-elf*)	    		fmt=elf ;;
-@@ -4344,7 +4352,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=elf em=lynx bfd_gas=yes ;;
-       i386-*-sysv[45]*)			fmt=elf ;;
-       i386-*-solaris*)			fmt=elf ;;
-@@ -4404,6 +4414,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 ;;
- 
-@@ -4431,6 +4442,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 ;;
-@@ -4505,6 +4517,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)  ;;
-@@ -4532,7 +4545,9 @@
-       ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
- 
-       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 ;;
-       s390-*-tpf*)			fmt=elf ;;
- 
-       sh*-*-linux*)			fmt=elf em=linux
-@@ -4568,6 +4583,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 -ur binutils-2.15.94.0.2.orig/gas/configure.in binutils-2.15.94.0.2/gas/configure.in
---- binutils-2.15.94.0.2.orig/gas/configure.in	2004-12-22 15:00:57.461987424 -0500
-+++ binutils-2.15.94.0.2/gas/configure.in	2004-12-22 15:01:19.022709696 -0500
-@@ -202,6 +202,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 ;;
- 
-@@ -218,6 +219,7 @@
-       arm-*-linux*aout*)		fmt=aout em=linux ;;
-       arm*-*-linux-gnueabi*)		fmt=elf  em=armlinuxeabi ;;	 
-       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 ;;
-@@ -231,6 +233,7 @@
- 
-       cris-*-linux-gnu* | crisv32-*-linux-gnu*)
- 					fmt=multi bfd_gas=yes em=linux ;;
-+      cris-*-linux-uclibc*)		fmt=multi bfd_gas=yes em=linux ;;
-       cris-*-* | crisv32-*-*)		fmt=multi bfd_gas=yes ;;
- 
-       crx-*-elf*)	    		fmt=elf ;;
-@@ -290,7 +293,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=elf em=lynx bfd_gas=yes ;;
- changequote(,)dnl
-       i386-*-sysv[45]*)			fmt=elf ;;
-@@ -343,6 +348,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 ;;
- 
-@@ -370,6 +376,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 ;;
-@@ -441,6 +448,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)  ;;
-@@ -461,7 +469,9 @@
-       ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
- 
-       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 ;;
-       s390-*-tpf*)			fmt=elf ;;
- 
-       sh*-*-linux*)			fmt=elf em=linux
-@@ -493,6 +503,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 -ur binutils-2.15.94.0.2.orig/gprof/configure binutils-2.15.94.0.2/gprof/configure
---- binutils-2.15.94.0.2.orig/gprof/configure	2004-12-22 15:00:57.949913248 -0500
-+++ binutils-2.15.94.0.2/gprof/configure	2004-12-22 15:01:19.030708480 -0500
-@@ -3418,6 +3418,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -ur binutils-2.15.94.0.2.orig/ld/configure binutils-2.15.94.0.2/ld/configure
---- binutils-2.15.94.0.2.orig/ld/configure	2004-12-22 15:00:58.032900632 -0500
-+++ binutils-2.15.94.0.2/ld/configure	2004-12-22 15:01:19.035707720 -0500
-@@ -1579,6 +1579,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -ur binutils-2.15.94.0.2.orig/ld/configure.tgt binutils-2.15.94.0.2/ld/configure.tgt
---- binutils-2.15.94.0.2.orig/ld/configure.tgt	2004-12-22 15:00:58.033900480 -0500
-+++ binutils-2.15.94.0.2/ld/configure.tgt	2004-12-22 15:01:19.036707568 -0500
-@@ -32,6 +32,7 @@
- 			targ_extra_libpath=$targ_extra_emuls ;;
- cris-*-linux-gnu* | cris-*-linux-gnu*)
- 			targ_emul=crislinux ;;
-+cris-*-linux-uclibc*)	targ_emul=crislinux ;;
- cris-*-* | crisv32-*-*)	targ_emul=criself
- 			targ_extra_emuls="crisaout crislinux"
- 			targ_extra_libpath=$targ_extra_emuls ;;
-@@ -62,14 +63,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
-@@ -121,7 +124,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 
-@@ -132,7 +137,7 @@
- m68*-apple-aux*)	targ_emul=m68kaux ;;
- maxq-*-coff)            targ_emul=maxqcoff;;
- *-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 ;;
-@@ -156,14 +161,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/'`
-@@ -263,11 +270,14 @@
- arm-*-kaos*)		targ_emul=armelf ;;
- arm9e-*-elf)		targ_emul=armelf ;;
- 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-gnueabi)	targ_emul=armelf_linux_eabi ;;
- 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 ;;
-@@ -371,7 +381,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/'`
- 			;;
-@@ -388,9 +399,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 ;;
-@@ -403,6 +414,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 ;;
-@@ -436,16 +448,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 ;;
-@@ -468,6 +480,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 -ur binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em binutils-2.15.94.0.2/ld/emultempl/elf32.em
---- binutils-2.15.94.0.2.orig/ld/emultempl/elf32.em	2004-12-22 15:00:58.044898808 -0500
-+++ binutils-2.15.94.0.2/ld/emultempl/elf32.em	2004-12-22 15:01:19.038707264 -0500
-@@ -65,7 +65,7 @@
- 
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-gnu* | *-*-linux-uclibc*)
-   cat >>e${EMULATION_NAME}.c <<EOF
- #include <glob.h>
- EOF
-@@ -337,7 +337,7 @@
- 
- EOF
- case ${target} in
--  *-*-linux-gnu*)
-+  *-*-linux-gnu* | *-*-linux-uclibc*)
-     cat >>e${EMULATION_NAME}.c <<EOF
- 	  {
- 	    struct bfd_link_needed_list *l;
-@@ -510,7 +510,7 @@
- 
- EOF
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-gnu* | *-*-linux-uclibc*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- /* For a native linker, check the file /etc/ld.so.conf for directories
-    in which we may find shared libraries.  /etc/ld.so.conf is really
-@@ -894,7 +894,7 @@
- EOF
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-gnu* | *-*-linux-uclibc*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
- 	    break;
-diff -ur binutils-2.15.94.0.2.orig/libiberty/configure binutils-2.15.94.0.2/libiberty/configure
---- binutils-2.15.94.0.2.orig/libiberty/configure	2004-12-22 15:00:59.263713520 -0500
-+++ binutils-2.15.94.0.2/libiberty/configure	2004-12-22 15:03:55.744884304 -0500
-@@ -3682,6 +3682,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -ur binutils-2.15.94.0.2.orig/libtool.m4 binutils-2.15.94.0.2/libtool.m4
---- binutils-2.15.94.0.2.orig/libtool.m4	2004-12-22 15:00:57.329007640 -0500
-+++ binutils-2.15.94.0.2/libtool.m4	2004-12-22 15:01:19.039707112 -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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-diff -ur binutils-2.15.94.0.2.orig/ltconfig binutils-2.15.94.0.2/ltconfig
---- binutils-2.15.94.0.2.orig/ltconfig	2004-12-22 15:00:57.330007488 -0500
-+++ binutils-2.15.94.0.2/ltconfig	2004-12-22 15:01:19.041706808 -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
- 
-@@ -1270,6 +1271,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 -ur binutils-2.15.94.0.2.orig/opcodes/configure binutils-2.15.94.0.2/opcodes/configure
---- binutils-2.15.94.0.2.orig/opcodes/configure	2004-12-22 15:00:59.334702728 -0500
-+++ binutils-2.15.94.0.2/opcodes/configure	2004-12-22 15:01:19.053704984 -0500
-@@ -3587,6 +3587,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-001_ld_makefile_patch.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/300-001_ld_makefile_patch.patch
deleted file mode 100644
index b25d5b7e21..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-## 001_ld_makefile_patch.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: correct where ld scripts are installed
-## DP: Author: Chris Chimelis <chris@debian.org>
-## DP: Upstream status: N/A
-## DP: Date: ??
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am binutils-2.14.90.0.6/ld/Makefile.am
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.am	2003-09-10 23:12:09.000000000 +0100
-@@ -19,7 +19,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in binutils-2.14.90.0.6/ld/Makefile.in
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.in	2003-09-10 23:12:09.000000000 +0100
-@@ -128,7 +128,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-006_better_file_error.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/300-006_better_file_error.patch
deleted file mode 100644
index f337611edf..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-006_better_file_error.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Specify which filename is causing an error if the filename is a
-## DP: directory. (#45832)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
-+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
-@@ -150,6 +150,13 @@
- {
-   bfd *nbfd;
-   const bfd_target *target_vec;
-+  struct stat s;
-+
-+  if (stat (filename, &s) == 0)
-+    if (S_ISDIR(s.st_mode)) {
-+      bfd_set_error (bfd_error_file_not_recognized);
-+      return NULL;
-+    }
- 
-   nbfd = _bfd_new_bfd ();
-   if (nbfd == NULL)
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-012_check_ldrunpath_length.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 498651a90c..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -871,6 +873,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch
deleted file mode 100644
index ae2033d069..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/300-120_mips_xgot_multigot_workaround.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## 120_mips_xgot_multigot_workaround.dpatch
-##
-## DP: Description: Make multigot/xgot handling mutually exclusive.
-## DP: Author: Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-## DP: Upstream status: Not submitted
-## DP: Date: 2004-09-17
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.15/bfd/elfxx-mips.c binutils-2.15/bfd/elfxx-mips.c
---- /home/james/debian/packages/binutils/binutils-2.15/bfd/elfxx-mips.c	2004-09-23 22:41:37.156466673 +0100
-+++ binutils-2.15/bfd/elfxx-mips.c	2004-09-23 22:42:15.998362861 +0100
-@@ -5883,6 +5883,8 @@
-   s->size += i * MIPS_ELF_GOT_SIZE (output_bfd);
- 
-   if (s->size > MIPS_ELF_GOT_MAX_SIZE (output_bfd)
-+      && g->global_gotno <= (MIPS_ELF_GOT_MAX_SIZE (output_bfd)
-+                            / MIPS_ELF_GOT_SIZE (output_bfd))
-       && ! mips_elf_multi_got (output_bfd, info, g, s, local_gotno))
-     return FALSE;
- 
diff --git a/openwrt/toolchain/binutils/2.15.94.0.2.2/702-binutils-skip-comments.patch b/openwrt/toolchain/binutils/2.15.94.0.2.2/702-binutils-skip-comments.patch
deleted file mode 100644
index 804a17e006..0000000000
--- a/openwrt/toolchain/binutils/2.15.94.0.2.2/702-binutils-skip-comments.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html
-Fixes
-localealias.s:544: Error: junk at end of line, first unrecognized character is `,' 
-when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3
-
-Paths adjusted to match crosstool's patcher.
-
-Message-Id: m3n052qw2g.fsf@whitebox.m5r.de
-From: Andreas Schwab <schwab at suse dot de>
-To: Nathan Sidwell <nathan at codesourcery dot com>
-Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com
-Date: Fri, 23 Apr 2004 22:27:19 +0200
-Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line
-
-Nathan Sidwell <nathan@codesourcery.com> writes:
-
-> Index: read.c
-> ===================================================================
-> RCS file: /cvs/src/src/gas/read.c,v
-> retrieving revision 1.76
-> diff -c -3 -p -r1.76 read.c
-> *** read.c	12 Mar 2004 17:48:12 -0000	1.76
-> --- read.c	18 Mar 2004 09:56:05 -0000
-> *************** read_a_source_file (char *name)
-> *** 1053,1059 ****
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  ignore_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-> --- 1053,1059 ----
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  demand_empty_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-
-This means that the unknown character is no longer ignored, despite the
-comment.  As a side effect a line starting with a line comment character
-not followed by APP in NO_APP mode now triggers an error instead of just a
-warning, breaking builds of glibc on m68k-linux.  Earlier in
-read_a_source_file where #APP is handled there is another comment that
-claims that unknown comments are ignored, when in fact they aren't (only
-the initial line comment character is skipped).
-
-Note that the presence of #APP will mess up the line counters, but
-that appears to be difficult to fix.
-
-Andreas.
-
-2004-04-23  Andreas Schwab  <schwab@suse.de>
-
-	* read.c (read_a_source_file): Ignore unknown text after line
-	comment character.  Fix misleading comment.
-
---- binutils/gas/read.c.~1.78.~	2004-04-23 08:58:23.000000000 +0200
-+++ binutils/gas/read.c	2004-04-23 21:49:01.000000000 +0200
-@@ -1,6 +1,6 @@
- /* read.c - read a source file -
-    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
--   1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+   1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
- This file is part of GAS, the GNU Assembler.
- 
-@@ -950,10 +950,14 @@ read_a_source_file (char *name)
- 	      unsigned int new_length;
- 	      char *tmp_buf = 0;
- 
--	      bump_line_counters ();
- 	      s = input_line_pointer;
- 	      if (strncmp (s, "APP\n", 4))
--		continue;	/* We ignore it */
-+		{
-+		  /* We ignore it */
-+		  ignore_rest_of_line ();
-+		  continue;
-+		}
-+	      bump_line_counters ();
- 	      s += 4;
- 
- 	      sb_new (&sbuf);
-@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
- 	    continue;
- #endif
- 	  input_line_pointer--;
--	  /* Report unknown char as ignored.  */
-+	  /* Report unknown char as error.  */
- 	  demand_empty_rest_of_line ();
- 	}
- 
-
--- 
-Andreas Schwab, SuSE Labs, schwab@suse.de
-SuSE Linux AG, Maxfeldstra&#xC3;e 5, 90409 N&#xC3;rnberg, Germany
-Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
-"And now for something completely different."
diff --git a/openwrt/toolchain/binutils/2.15.97/100-uclibc-conf.patch b/openwrt/toolchain/binutils/2.15.97/100-uclibc-conf.patch
deleted file mode 100644
index 7c0a72693f..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/100-uclibc-conf.patch
+++ /dev/null
@@ -1,586 +0,0 @@
-diff -ur binutils-2.15.97.orig/bfd/config.bfd binutils-2.15.97/bfd/config.bfd
---- binutils-2.15.97.orig/bfd/config.bfd	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/config.bfd	2005-04-29 20:53:50.000000000 -0400
-@@ -140,7 +140,7 @@
-     targ_defvec=ecoffalpha_little_vec
-     targ_selvecs=bfd_elf64_alpha_vec
-     ;;
--  alpha*-*-linux-gnu* | alpha*-*-elf*)
-+  alpha*-*-linux-* | alpha*-*-elf*)
-     targ_defvec=bfd_elf64_alpha_vec
-     targ_selvecs=ecoffalpha_little_vec
-     ;;
-@@ -150,7 +150,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-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-     targ_defvec=bfd_elf64_ia64_little_vec
-     targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
-     ;;
-@@ -227,7 +227,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  armeb-*-elf | arm*b-*-linux-gnu*)
-+  armeb-*-elf | arm*b-*-linux-*)
-     targ_defvec=bfd_elf32_bigarm_vec
-     targ_selvecs=bfd_elf32_littlearm_vec
-     ;;
-@@ -235,7 +235,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-* | arm*-*-conix* | \
-   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-   arm*-*-eabi* )
-     targ_defvec=bfd_elf32_littlearm_vec
-@@ -385,7 +385,7 @@
-     ;;
- 
- #ifdef BFD64
--  hppa*64*-*-linux-gnu*)
-+  hppa*64*-*-linux-*)
-     targ_defvec=bfd_elf64_hppa_linux_vec
-     targ_selvecs=bfd_elf64_hppa_vec
-     ;;
-@@ -396,7 +396,7 @@
-     ;;
- #endif
- 
--  hppa*-*-linux-gnu*)
-+  hppa*-*-linux-*)
-     targ_defvec=bfd_elf32_hppa_linux_vec
-     targ_selvecs=bfd_elf32_hppa_vec
-     ;;
-@@ -529,7 +529,7 @@
-     targ_selvecs=bfd_elf32_i386_vec
-     targ_underscore=yes
-     ;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
-     targ_defvec=bfd_elf32_i386_vec
-     targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
-     targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -543,7 +543,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-*)
-     targ_defvec=bfd_elf64_x86_64_vec
-     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
-     ;;
-@@ -719,7 +719,7 @@
-     targ_selvecs=bfd_elf32_m68k_vec
-     targ_underscore=yes
-     ;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
-     targ_defvec=bfd_elf32_m68k_vec
-     targ_selvecs=m68klinux_vec
-     ;;
-@@ -1005,7 +1005,7 @@
-     ;;
- #endif
-   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
--  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-+  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
-   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
-     targ_defvec=bfd_elf32_powerpc_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -1042,7 +1042,7 @@
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-     ;;
-   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
--  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
-+  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
-   powerpcle-*-rtems*)
-     targ_defvec=bfd_elf32_powerpcle_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-@@ -1213,7 +1213,7 @@
-     targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
-     targ_underscore=yes
-     ;;
--  sparc-*-linux-gnu*)
-+  sparc-*-linux-*)
-     targ_defvec=bfd_elf32_sparc_vec
-     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
-     ;;
-@@ -1260,7 +1260,7 @@
-     targ_defvec=sunos_big_vec
-     targ_underscore=yes
-     ;;
--  sparc64-*-linux-gnu*)
-+  sparc64-*-linux-*)
-     targ_defvec=bfd_elf64_sparc_vec
-     targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
-     ;;
-@@ -1329,7 +1329,7 @@
-     targ_underscore=yes
-     ;;
- 
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
-     targ_defvec=bfd_elf32_vax_vec
-     ;;
- 
-diff -ur binutils-2.15.97.orig/bfd/configure binutils-2.15.97/bfd/configure
---- binutils-2.15.97.orig/bfd/configure	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/configure	2005-04-29 20:53:50.000000000 -0400
-@@ -9918,7 +9918,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -9982,7 +9982,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
- 	;;
-@@ -10020,7 +10020,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -10154,7 +10154,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
-diff -ur binutils-2.15.97.orig/bfd/configure.in binutils-2.15.97/bfd/configure.in
---- binutils-2.15.97.orig/bfd/configure.in	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/configure.in	2005-04-29 20:53:50.000000000 -0400
-@@ -163,7 +163,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -248,7 +248,7 @@
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
- changequote(,)dnl
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- changequote([,])dnl
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
-@@ -289,7 +289,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -375,7 +375,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
-diff -ur binutils-2.15.97.orig/gas/configure binutils-2.15.97/gas/configure
---- binutils-2.15.97.orig/gas/configure	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure	2005-04-29 20:53:50.000000000 -0400
-@@ -4462,7 +4462,7 @@
- _ACEOF
- 
- 	;;
--      ppc-*-linux-gnu*)
-+      ppc-*-linux-*)
- 	case "$endian" in
- 	  big)  ;;
- 	  *)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
-diff -ur binutils-2.15.97.orig/gas/configure.in binutils-2.15.97/gas/configure.in
---- binutils-2.15.97.orig/gas/configure.in	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure.in	2005-04-29 20:53:50.000000000 -0400
-@@ -161,7 +161,7 @@
- 	AC_DEFINE(AIX_WEAK_SUPPORT, 1,
- 		  [Define if using AIX 5.2 value for C_WEAKEXT.])
- 	;;
--      ppc-*-linux-gnu*)
-+      ppc-*-linux-*)
- 	case "$endian" in
- 	  big)  ;;
- 	  *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-diff -ur binutils-2.15.97.orig/gas/configure.tgt binutils-2.15.97/gas/configure.tgt
---- binutils-2.15.97.orig/gas/configure.tgt	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure.tgt	2005-04-29 20:53:50.000000000 -0400
-@@ -100,7 +100,7 @@
-   alpha-*-*vms*)			fmt=evax ;;
-   alpha-*-osf*)				fmt=ecoff ;;
-   alpha-*-linuxecoff*)			fmt=ecoff ;;
--  alpha-*-linux-gnu*)			fmt=elf em=linux ;;
-+  alpha-*-linux-*)			fmt=elf em=linux ;;
-   alpha-*-netbsd*)			fmt=elf em=nbsd ;;
-   alpha-*-openbsd*)			fmt=elf em=obsd ;;
- 
-@@ -116,7 +116,7 @@
-   arm-*-conix*)				fmt=elf ;;
-   arm-*-linux*aout*)			fmt=aout em=linux ;;
-   arm-*-linux-gnueabi*)			fmt=elf  em=armlinuxeabi ;;	 
--  arm-*-linux-gnu*)			fmt=elf  em=linux ;;
-+  arm-*-linux-*)			fmt=elf  em=linux ;;
-   arm-*-uclinux*)			fmt=elf  em=linux ;;
-   arm-*-netbsdelf*)                 	fmt=elf  em=nbsd ;;
-   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -128,7 +128,7 @@
- 
-   avr-*-*)				fmt=elf ;;
- 
--  cris-*-linux-gnu* | crisv32-*-linux-gnu*)
-+  cris-*-linux-* | crisv32-*-linux-*)
- 					fmt=multi bfd_gas=yes em=linux ;;
-   cris-*-* | crisv32-*-*)		fmt=multi bfd_gas=yes ;;
- 
-@@ -192,7 +192,7 @@
-   i386-*-linux*aout*)			fmt=aout em=linux ;;
-   i386-*-linux*oldld)			fmt=aout em=linux ;;
-   i386-*-linux*coff*)			fmt=coff em=linux ;;
--  i386-*-linux-gnu*)			fmt=elf em=linux ;;
-+  i386-*-linux-*)			fmt=elf em=linux ;;
-   i386-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
-   i386-*-sysv[45]*)			fmt=elf ;;
-   i386-*-solaris*)			fmt=elf ;;
-@@ -238,7 +238,7 @@
- 
-   ia64-*-elf*)				fmt=elf ;;
-   ia64-*-aix*)				fmt=elf em=ia64aix ;;
--  ia64-*-linux-gnu*)			fmt=elf em=linux ;;
-+  ia64-*-linux-*)			fmt=elf em=linux ;;
-   ia64-*-hpux*)				fmt=elf em=hpux ;;
-   ia64-*-netbsd*)			fmt=elf em=nbsd ;;
- 
-@@ -265,7 +265,7 @@
-   m68k-*-rtems*)			fmt=elf ;;
-   m68k-*-hpux*)				fmt=hp300 em=hp300 ;;
-   m68k-*-linux*aout*)			fmt=aout em=linux ;;
--  m68k-*-linux-gnu*)			fmt=elf em=linux ;;
-+  m68k-*-linux-*)			fmt=elf em=linux ;;
-   m68k-*-uclinux*)			fmt=elf ;;
-   m68k-*-gnu*)				fmt=elf ;;
-   m68k-*-netbsdelf*)			fmt=elf em=nbsd ;;
-@@ -332,7 +332,7 @@
-   ppc-*-beos*)				fmt=coff ;;
-   ppc-*-*n*bsd* | ppc-*-elf*)		fmt=elf ;;
-   ppc-*-eabi* | ppc-*-sysv4*)		fmt=elf ;;
--  ppc-*-linux-gnu*)			fmt=elf em=linux ;;
-+  ppc-*-linux-*)			fmt=elf em=linux ;;
-   ppc-*-solaris*)			fmt=elf ;;
-   ppc-*-rtems*)				fmt=elf ;;
-   ppc-*-macos*)				fmt=coff em=macos ;;
-@@ -340,7 +340,7 @@
-   ppc-*-kaos*)				fmt=elf ;;
-   ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
- 
--  s390-*-linux-gnu*)			fmt=elf em=linux ;;
-+  s390-*-linux-*)			fmt=elf em=linux ;;
-   s390-*-tpf*)				fmt=elf ;;
- 
-   sh*-*-linux*)				fmt=elf em=linux
-@@ -369,7 +369,7 @@
-   sparc-*-aout | sparc*-*-vxworks*)	fmt=aout em=sparcaout ;;
-   sparc-*-coff)				fmt=coff ;;
-   sparc-*-linux*aout*)			fmt=aout em=linux ;;
--  sparc-*-linux-gnu*)			fmt=elf em=linux ;;
-+  sparc-*-linux-*)			fmt=elf em=linux ;;
-   sparc-fujitsu-none)			fmt=aout ;;
-   sparc-*-elf)				fmt=elf ;;
-   sparc-*-sysv4*)			fmt=elf ;;
-@@ -398,7 +398,7 @@
-   vax-*-netbsdelf*)			fmt=elf em=nbsd ;;
-   vax-*-netbsd*)			fmt=aout em=nbsd ;;
-   vax-*-bsd* | vax-*-ultrix*)		fmt=aout ;;
--  vax-*-linux-gnu*)			fmt=elf em=linux bfd_gas=yes ;;
-+  vax-*-linux-*)			fmt=elf em=linux bfd_gas=yes ;;
- 
-   w65-*-*)				fmt=coff ;;
- 
-diff -ur binutils-2.15.97.orig/ld/configure.host binutils-2.15.97/ld/configure.host
---- binutils-2.15.97.orig/ld/configure.host	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/configure.host	2005-04-29 20:53:50.000000000 -0400
-@@ -83,7 +83,7 @@
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
-   ;;
- 
--arm*-*-linux-gnu*)
-+arm*-*-linux-*)
-   HOSTING_CRT0='-p '`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
-   ;;
- 
-@@ -141,7 +141,7 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' -lcygwin -L/usr/lib/w32api -luser32 -lkernel32 -ladvapi32 -lshell32 `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi`'
-   ;;
- 
--ia64-*-linux-gnu*)
-+ia64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]*\*,ld-linux-ia64,g"`
-   ;;
- 
-@@ -155,11 +155,11 @@
-   HOSTING_LIBS='-L/usr/lib32 '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o ; else ${CC} -print-file-name=crtend.o; fi` /usr/lib32/crtn.o -init __do_global_ctors -fini __do_global_dtors'
-   ;;
- 
--mips*-*-linux-gnu*)
-+mips*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
--m68*-*-linux-gnu*)
-+m68*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
-@@ -183,19 +183,19 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi`'
-   ;;
- 
--powerpc64*-*-linux-gnu*)
-+powerpc64*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld64.so.1,"`
-   ;;
- 
--powerpc*-*-linux-gnu*)
-+powerpc*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
--s390x-*-linux-gnu*)
-+s390x-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld64.so.1,"`
-   ;;
- 
--s390-*-linux-gnu*)
-+s390-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
-@@ -209,15 +209,15 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
-   ;;
- 
--sparc-*-linux-gnu*)
-+sparc-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld-linux.so.2,"`
-   ;;
- 
--sparc64-*-linux-gnu*)
-+sparc64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux.so.2,"`
-   ;;
- 
--x86_64-*-linux-gnu*)
-+x86_64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux-x86-64.so.2,"`
-   ;;
- 
-diff -ur binutils-2.15.97.orig/ld/configure.tgt binutils-2.15.97/ld/configure.tgt
---- binutils-2.15.97.orig/ld/configure.tgt	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/configure.tgt	2005-04-29 20:53:50.000000000 -0400
-@@ -30,7 +30,7 @@
- cris-*-*aout*)		targ_emul=crisaout
- 			targ_extra_emuls="criself crislinux"
- 			targ_extra_libpath=$targ_extra_emuls ;;
--cris-*-linux-gnu* | cris-*-linux-gnu*)
-+cris-*-linux-* | crisv32-*-linux-*)
- 			targ_emul=crislinux ;;
- cris-*-* | crisv32-*-*)	targ_emul=criself
- 			targ_extra_emuls="crisaout crislinux"
-@@ -62,14 +62,14 @@
- 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
- 			tdir_sun4=sparc-sun-sunos4
- 			;;
--sparc64-*-linux-gnu*)	targ_emul=elf64_sparc
-+sparc64-*-linux-*)	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-*)	targ_emul=elf32_sparc
- 			targ_extra_emuls="sparclinux elf64_sparc sun4"
- 			targ_extra_libpath=elf64_sparc
- 			tdir_sparclinux=${targ_alias}aout
-@@ -119,8 +119,8 @@
- ia64-*-aix*)		targ_emul=elf64_aix ;;
- m32r*le-*-elf*)         targ_emul=m32rlelf ;;
- m32r*-*-elf*)           targ_emul=m32relf ;;
--m32r*le-*-linux-gnu*)   targ_emul=m32rlelf_linux ;;
--m32r*-*-linux-gnu*)     targ_emul=m32relf_linux ;;
-+m32r*le-*-linux-*)      targ_emul=m32rlelf_linux ;;
-+m32r*-*-linux-*)        targ_emul=m32relf_linux ;;
- m68hc11-*-*|m6811-*-*)	targ_emul=m68hc11elf 
- 			targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;
- m68hc12-*-*|m6812-*-*)	targ_emul=m68hc12elf 
-@@ -131,7 +131,7 @@
- m68*-apple-aux*)	targ_emul=m68kaux ;;
- maxq-*-coff)            targ_emul=maxqcoff;;
- *-tandem-none)		targ_emul=st2000 ;;
--i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
-+i370-*-elf* | i370-*-linux-*) 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 ;;
-@@ -155,14 +155,14 @@
- 			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-*)	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-*)	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/'`
-@@ -262,13 +262,13 @@
- arm-*-kaos*)		targ_emul=armelf ;;
- arm9e-*-elf)		targ_emul=armelf ;;
- arm*b-*-linux-gnueabi)	targ_emul=armelfb_linux_eabi ;;
--arm*b-*-linux-gnu*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
-+arm*b-*-linux-*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
- arm*-*-linux-gnueabi)	targ_emul=armelf_linux_eabi ;;
--arm*-*-linux-gnu*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+arm*-*-linux-*)	        targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm-*-vxworks)		targ_emul=armelf_vxworks ;;
- arm*-*-conix*)		targ_emul=armelf ;;
--thumb-*-linux-gnu* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+thumb-*-linux-* | 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 ;;
-@@ -372,7 +372,7 @@
- 			targ_extra_emuls=m68kelf
- 			tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
- 			;;
--m68k-*-linux-gnu*)	targ_emul=m68kelf
-+m68k-*-linux-*) 	targ_emul=m68kelf
- 			targ_extra_emuls=m68klinux
- 			tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
- 			;;
-@@ -388,9 +388,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-*)	targ_emul=hppa64linux ;;
- hppa*64*-*)		targ_emul=elf64hppa ;;
--hppa*-*-linux-gnu*)	targ_emul=hppalinux ;;
-+hppa*-*-linux-*)	targ_emul=hppalinux ;;
- hppa*-*-*elf*)		targ_emul=hppaelf ;;
- hppa*-*-lites*)		targ_emul=hppaelf ;;
- hppa*-*-netbsd*)	targ_emul=hppanbsd ;;
-@@ -402,7 +402,7 @@
- vax-*-netbsdaout* | vax-*-netbsd*)
- 			targ_emul=vaxnbsd
- 			targ_extra_emuls=elf32vax ;;
--vax-*-linux-gnu*)	targ_emul=elf32vax ;;
-+vax-*-linux-*)  	targ_emul=elf32vax ;;
- mips*-*-pe)		targ_emul=mipspe ;
- 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
- mips*-dec-ultrix*)	targ_emul=mipslit ;;
-@@ -436,18 +436,18 @@
- mips*-*-vxworks*)	targ_emul=elf32ebmip
- 		        targ_extra_emuls="elf32elmip" ;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss ;;
--mips64*el-*-linux-gnu*)	targ_emul=elf32ltsmipn32
-+mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
- 			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
- 			targ_extra_libpath="elf32ltsmip elf64ltsmip"
- 			;;
--mips64*-*-linux-gnu*)	targ_emul=elf32btsmipn32
-+mips64*-*-linux-*)	targ_emul=elf32btsmipn32
- 			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
- 			targ_extra_libpath="elf32btsmip elf64btsmip"
- 			;;
--mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
-+mips*el-*-linux-*)	targ_emul=elf32ltsmip
- 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
- 			;;
--mips*-*-linux-gnu*)	targ_emul=elf32btsmip
-+mips*-*-linux-*)	targ_emul=elf32btsmip
- 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
- 			;;
- mips*-*-lnews*)		targ_emul=mipslnews ;;
-@@ -467,7 +467,7 @@
- alpha*-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha
- 			tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'`
- 			;;
--alpha*-*-linux-gnu*)	targ_emul=elf64alpha targ_extra_emuls=alpha
-+alpha*-*-linux-*)	targ_emul=elf64alpha targ_extra_emuls=alpha
- 			tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
- 			;;
- alpha*-*-osf*)		targ_emul=alpha ;;
-diff -ur binutils-2.15.97.orig/ld/emultempl/elf32.em binutils-2.15.97/ld/emultempl/elf32.em
---- binutils-2.15.97.orig/ld/emultempl/elf32.em	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/emultempl/elf32.em	2005-04-29 20:53:50.000000000 -0400
-@@ -65,7 +65,7 @@
- 
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-   cat >>e${EMULATION_NAME}.c <<EOF
- #ifdef HAVE_GLOB
- #include <glob.h>
-@@ -350,7 +350,7 @@
- 
- EOF
- case ${target} in
--  *-*-linux-gnu*)
-+  *-*-linux-*)
-     cat >>e${EMULATION_NAME}.c <<EOF
- 	  {
- 	    struct bfd_link_needed_list *l;
-@@ -522,7 +522,7 @@
- 
- EOF
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- /* For a native linker, check the file /etc/ld.so.conf for directories
-    in which we may find shared libraries.  /etc/ld.so.conf is really
-@@ -932,7 +932,7 @@
- EOF
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
- 	    break;
diff --git a/openwrt/toolchain/binutils/2.15.97/110-uclibc-libtool-conf.patch b/openwrt/toolchain/binutils/2.15.97/110-uclibc-libtool-conf.patch
deleted file mode 100644
index ec38caa125..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/110-uclibc-libtool-conf.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff -urN binutils-2.16.90.0.2-dist/bfd/configure binutils-2.16.90.0.2/bfd/configure
---- binutils-2.16.90.0.2-dist/bfd/configure	2005-04-29 12:50:24.000000000 -0500
-+++ binutils-2.16.90.0.2/bfd/configure	2005-04-30 11:34:59.246377032 -0500
-@@ -3584,6 +3584,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/binutils/configure binutils-2.16.90.0.2/binutils/configure
---- binutils-2.16.90.0.2-dist/binutils/configure	2005-04-29 12:50:26.000000000 -0500
-+++ binutils-2.16.90.0.2/binutils/configure	2005-04-30 11:35:28.900868864 -0500
-@@ -1577,6 +1577,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/configure binutils-2.16.90.0.2/configure
---- binutils-2.16.90.0.2-dist/configure	2005-04-29 12:50:23.000000000 -0500
-+++ binutils-2.16.90.0.2/configure	2005-04-30 11:31:12.525843792 -0500
-@@ -1111,7 +1111,7 @@
-     ;;
- "")
-     case "${target}" in
--    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
-         # Enable libmudflap by default in GNU and friends.
- 	;;
-     *-*-freebsd*)
-diff -urN binutils-2.16.90.0.2-dist/configure.in binutils-2.16.90.0.2/configure.in
---- binutils-2.16.90.0.2-dist/configure.in	2005-04-29 12:50:23.000000000 -0500
-+++ binutils-2.16.90.0.2/configure.in	2005-04-30 11:29:51.643139832 -0500
-@@ -328,7 +328,7 @@
-     ;;
- "")
-     case "${target}" in
--    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
-         # Enable libmudflap by default in GNU and friends.
- 	;;
-     *-*-freebsd*)
-diff -urN binutils-2.16.90.0.2-dist/gas/configure binutils-2.16.90.0.2/gas/configure
---- binutils-2.16.90.0.2-dist/gas/configure	2005-04-29 12:50:27.000000000 -0500
-+++ binutils-2.16.90.0.2/gas/configure	2005-04-30 11:35:21.097055224 -0500
-@@ -3421,6 +3421,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp
---- binutils-2.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp	2005-04-09 14:03:14.000000000 -0500
-+++ binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp	2005-04-30 11:41:57.301822944 -0500
-@@ -20,7 +20,7 @@
- 
- # Written by Cygnus Support.
- 
--if [istarget "sh*-*-linux-gnu"] {
-+if {[istarget "sh*-*-linux-gnu"] || [istarget "sh*-*-linux-uclibc"]} {
-     global ASFLAGS
-     set ASFLAGS "$ASFLAGS -big"
- }
-diff -urN binutils-2.16.90.0.2-dist/gprof/configure binutils-2.16.90.0.2/gprof/configure
---- binutils-2.16.90.0.2-dist/gprof/configure	2005-04-29 12:50:29.000000000 -0500
-+++ binutils-2.16.90.0.2/gprof/configure	2005-04-30 11:35:36.880655752 -0500
-@@ -3419,6 +3419,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ld/configure binutils-2.16.90.0.2/ld/configure
---- binutils-2.16.90.0.2-dist/ld/configure	2005-04-29 12:50:30.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/configure	2005-04-30 11:46:15.974498720 -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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp
---- binutils-2.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp	2005-04-09 14:03:29.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp	2005-04-30 11:45:07.890849008 -0500
-@@ -62,7 +62,7 @@
- 
- set testsrec "SH relaxing to S-records"
- 
--if [istarget sh*-linux-gnu] {
-+if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
-     # This target needs the explicit entry address.
-     catch "exec $objdump -x tmpdir/sh1 | grep start\\ address | sed s/start\\ address//" entry_addr
-     set srec_relax_arg "-Ttext $entry_addr -relax --oformat srec tmpdir/sh1.o"
-@@ -117,7 +117,7 @@
-     return
- }
- 
--if [istarget sh*-linux-gnu] {
-+if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
-     exec sed -e s/_main/main/ -e s/_trap/trap/ -e s/_stack/stack/ \
- 	    < $srcdir/$subdir/start.s >tmpdir/start.s
- } else {
-diff -urN binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp
---- binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp	2005-04-29 12:50:30.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp	2005-04-30 11:44:26.358162936 -0500
-@@ -385,7 +385,7 @@
- setup_xfail "v850*-*-elf"
- 
- # The S-record linker doesn't handle Alpha Elf relaxation.
--setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
-+setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
- setup_xfail "alpha*-*-netbsd*"
- 
- # The S-record linker hasn't any hope of coping with HPPA relocs.
-@@ -424,7 +424,7 @@
- setup_xfail "thumb-*-*"
- setup_xfail "powerpc*-*-eabi*"
- setup_xfail "v850*-*-elf"
--setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
-+setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
- setup_xfail "alpha*-*-netbsd*"
- setup_xfail "hppa*-*-*"
- setup_xfail "ia64-*-*"
-diff -urN binutils-2.16.90.0.2-dist/libtool.m4 binutils-2.16.90.0.2/libtool.m4
---- binutils-2.16.90.0.2-dist/libtool.m4	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.16.90.0.2/libtool.m4	2005-04-30 11:35:54.062043784 -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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ltconfig binutils-2.16.90.0.2/ltconfig
---- binutils-2.16.90.0.2-dist/ltconfig	2004-11-22 14:33:30.000000000 -0600
-+++ binutils-2.16.90.0.2/ltconfig	2005-04-30 11:22:10.594229920 -0500
-@@ -602,6 +602,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
-+linux-uclibc*) ;;
- linux-gnu*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-@@ -1270,6 +1271,23 @@
-   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.
-+  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.16.90.0.2-dist/opcodes/configure binutils-2.16.90.0.2/opcodes/configure
---- binutils-2.16.90.0.2-dist/opcodes/configure	2005-04-29 12:50:31.000000000 -0500
-+++ binutils-2.16.90.0.2/opcodes/configure	2005-04-30 11:17:07.168357664 -0500
-@@ -3588,6 +3588,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff --git a/openwrt/toolchain/binutils/2.15.97/300-001_ld_makefile_patch.patch b/openwrt/toolchain/binutils/2.15.97/300-001_ld_makefile_patch.patch
deleted file mode 100644
index b25d5b7e21..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-## 001_ld_makefile_patch.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: correct where ld scripts are installed
-## DP: Author: Chris Chimelis <chris@debian.org>
-## DP: Upstream status: N/A
-## DP: Date: ??
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am binutils-2.14.90.0.6/ld/Makefile.am
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.am	2003-09-10 23:12:09.000000000 +0100
-@@ -19,7 +19,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in binutils-2.14.90.0.6/ld/Makefile.in
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.in	2003-09-10 23:12:09.000000000 +0100
-@@ -128,7 +128,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
diff --git a/openwrt/toolchain/binutils/2.15.97/300-006_better_file_error.patch b/openwrt/toolchain/binutils/2.15.97/300-006_better_file_error.patch
deleted file mode 100644
index f337611edf..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/300-006_better_file_error.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Specify which filename is causing an error if the filename is a
-## DP: directory. (#45832)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
-+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
-@@ -150,6 +150,13 @@
- {
-   bfd *nbfd;
-   const bfd_target *target_vec;
-+  struct stat s;
-+
-+  if (stat (filename, &s) == 0)
-+    if (S_ISDIR(s.st_mode)) {
-+      bfd_set_error (bfd_error_file_not_recognized);
-+      return NULL;
-+    }
- 
-   nbfd = _bfd_new_bfd ();
-   if (nbfd == NULL)
diff --git a/openwrt/toolchain/binutils/2.15.97/300-012_check_ldrunpath_length.patch b/openwrt/toolchain/binutils/2.15.97/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 498651a90c..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -871,6 +873,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/openwrt/toolchain/binutils/2.15.97/702-binutils-skip-comments.patch b/openwrt/toolchain/binutils/2.15.97/702-binutils-skip-comments.patch
deleted file mode 100644
index 9ef7a7c9ec..0000000000
--- a/openwrt/toolchain/binutils/2.15.97/702-binutils-skip-comments.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html
-Fixes
-localealias.s:544: Error: junk at end of line, first unrecognized character is `,' 
-when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3
-
-Paths adjusted to match crosstool's patcher.
-
-Message-Id: m3n052qw2g.fsf@whitebox.m5r.de
-From: Andreas Schwab <schwab at suse dot de>
-To: Nathan Sidwell <nathan at codesourcery dot com>
-Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com
-Date: Fri, 23 Apr 2004 22:27:19 +0200
-Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line
-
-Nathan Sidwell <nathan@codesourcery.com> writes:
-
-> Index: read.c
-> ===================================================================
-> RCS file: /cvs/src/src/gas/read.c,v
-> retrieving revision 1.76
-> diff -c -3 -p -r1.76 read.c
-> *** read.c	12 Mar 2004 17:48:12 -0000	1.76
-> --- read.c	18 Mar 2004 09:56:05 -0000
-> *************** read_a_source_file (char *name)
-> *** 1053,1059 ****
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  ignore_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-> --- 1053,1059 ----
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  demand_empty_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-
-This means that the unknown character is no longer ignored, despite the
-comment.  As a side effect a line starting with a line comment character
-not followed by APP in NO_APP mode now triggers an error instead of just a
-warning, breaking builds of glibc on m68k-linux.  Earlier in
-read_a_source_file where #APP is handled there is another comment that
-claims that unknown comments are ignored, when in fact they aren't (only
-the initial line comment character is skipped).
-
-Note that the presence of #APP will mess up the line counters, but
-that appears to be difficult to fix.
-
-Andreas.
-
-2004-04-23  Andreas Schwab  <schwab@suse.de>
-
-	* read.c (read_a_source_file): Ignore unknown text after line
-	comment character.  Fix misleading comment.
-
---- binutils/gas/read.c.~1.78.~	2004-04-23 08:58:23.000000000 +0200
-+++ binutils/gas/read.c	2004-04-23 21:49:01.000000000 +0200
-@@ -950,10 +950,14 @@ read_a_source_file (char *name)
- 	      unsigned int new_length;
- 	      char *tmp_buf = 0;
- 
--	      bump_line_counters ();
- 	      s = input_line_pointer;
- 	      if (strncmp (s, "APP\n", 4))
--		continue;	/* We ignore it */
-+		{
-+		  /* We ignore it */
-+		  ignore_rest_of_line ();
-+		  continue;
-+		}
-+	      bump_line_counters ();
- 	      s += 4;
- 
- 	      sb_new (&sbuf);
-@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
- 	    continue;
- #endif
- 	  input_line_pointer--;
--	  /* Report unknown char as ignored.  */
-+	  /* Report unknown char as error.  */
- 	  demand_empty_rest_of_line ();
- 	}
- 
-
--- 
-Andreas Schwab, SuSE Labs, schwab@suse.de
-SuSE Linux AG, Maxfeldstra&#xC3;e 5, 90409 N&#xC3;rnberg, Germany
-Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
-"And now for something completely different."
diff --git a/openwrt/toolchain/binutils/2.15/100-uclibc-conf.patch b/openwrt/toolchain/binutils/2.15/100-uclibc-conf.patch
deleted file mode 100644
index 1c7fa4a400..0000000000
--- a/openwrt/toolchain/binutils/2.15/100-uclibc-conf.patch
+++ /dev/null
@@ -1,692 +0,0 @@
-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]+$'
diff --git a/openwrt/toolchain/binutils/2.15/600-arm-textrel.patch b/openwrt/toolchain/binutils/2.15/600-arm-textrel.patch
deleted file mode 100644
index 73d5b9df8e..0000000000
--- a/openwrt/toolchain/binutils/2.15/600-arm-textrel.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-06/msg00010.html
---- binutils-2.15.90.0.3-old/bfd/elf32-arm.h	2004-04-12 14:56:33.000000000 -0500
-+++ binutils-2.15.90.0.3/bfd/elf32-arm.h	2004-09-03 06:56:40.000000000 -0500
-@@ -87,6 +87,8 @@
- #endif
- static bfd_boolean allocate_dynrelocs 
-   PARAMS ((struct elf_link_hash_entry *h, PTR inf));
-+static bfd_boolean elf32_arm_readonly_dynrelocs
-+  PARAMS ((struct elf_link_hash_entry *, PTR));
- static bfd_boolean create_got_section 
-   PARAMS ((bfd * dynobj, struct bfd_link_info * info));
- static bfd_boolean elf32_arm_create_dynamic_sections 
-@@ -3531,6 +3533,37 @@
-   return TRUE;
- }
- 
-+/* Find any dynamic relocs that apply to read-only sections.  */
-+
-+static bfd_boolean
-+elf32_arm_readonly_dynrelocs (h, inf)
-+     struct elf_link_hash_entry *h;
-+     PTR inf;
-+{
-+  struct elf32_arm_link_hash_entry *eh;
-+  struct elf32_arm_relocs_copied *p;
-+
-+  if (h->root.type == bfd_link_hash_warning)
-+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+
-+  eh = (struct elf32_arm_link_hash_entry *) h;
-+  for (p = eh->relocs_copied; p != NULL; p = p->next)
-+    {
-+      asection *s = p->section;
-+
-+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-+       {
-+         struct bfd_link_info *info = (struct bfd_link_info *) inf;
-+
-+         info->flags |= DF_TEXTREL;
-+
-+         /* Not an error, just cut short the traversal.  */
-+         return FALSE;
-+       }
-+    }
-+  return TRUE;
-+}
-+
- /* Set the sizes of the dynamic sections.  */
- 
- static bfd_boolean
-@@ -3740,6 +3773,12 @@
- 	    return FALSE;
- 	}
- 
-+      /* If any dynamic relocs apply to a read-only section,
-+         then we need a DT_TEXTREL entry.  */
-+      if ((info->flags & DF_TEXTREL) == 0)
-+        elf_link_hash_traverse (&htab->root, elf32_arm_readonly_dynrelocs,
-+                                (PTR) info);
-+
-       if ((info->flags & DF_TEXTREL) != 0)
- 	{
- 	  if (!add_dynamic_entry (DT_TEXTREL, 0))
diff --git a/openwrt/toolchain/binutils/2.16/100-uclibc-conf.patch b/openwrt/toolchain/binutils/2.16/100-uclibc-conf.patch
deleted file mode 100644
index 7c0a72693f..0000000000
--- a/openwrt/toolchain/binutils/2.16/100-uclibc-conf.patch
+++ /dev/null
@@ -1,586 +0,0 @@
-diff -ur binutils-2.15.97.orig/bfd/config.bfd binutils-2.15.97/bfd/config.bfd
---- binutils-2.15.97.orig/bfd/config.bfd	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/config.bfd	2005-04-29 20:53:50.000000000 -0400
-@@ -140,7 +140,7 @@
-     targ_defvec=ecoffalpha_little_vec
-     targ_selvecs=bfd_elf64_alpha_vec
-     ;;
--  alpha*-*-linux-gnu* | alpha*-*-elf*)
-+  alpha*-*-linux-* | alpha*-*-elf*)
-     targ_defvec=bfd_elf64_alpha_vec
-     targ_selvecs=ecoffalpha_little_vec
-     ;;
-@@ -150,7 +150,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-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-     targ_defvec=bfd_elf64_ia64_little_vec
-     targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
-     ;;
-@@ -227,7 +227,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  armeb-*-elf | arm*b-*-linux-gnu*)
-+  armeb-*-elf | arm*b-*-linux-*)
-     targ_defvec=bfd_elf32_bigarm_vec
-     targ_selvecs=bfd_elf32_littlearm_vec
-     ;;
-@@ -235,7 +235,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-* | arm*-*-conix* | \
-   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-   arm*-*-eabi* )
-     targ_defvec=bfd_elf32_littlearm_vec
-@@ -385,7 +385,7 @@
-     ;;
- 
- #ifdef BFD64
--  hppa*64*-*-linux-gnu*)
-+  hppa*64*-*-linux-*)
-     targ_defvec=bfd_elf64_hppa_linux_vec
-     targ_selvecs=bfd_elf64_hppa_vec
-     ;;
-@@ -396,7 +396,7 @@
-     ;;
- #endif
- 
--  hppa*-*-linux-gnu*)
-+  hppa*-*-linux-*)
-     targ_defvec=bfd_elf32_hppa_linux_vec
-     targ_selvecs=bfd_elf32_hppa_vec
-     ;;
-@@ -529,7 +529,7 @@
-     targ_selvecs=bfd_elf32_i386_vec
-     targ_underscore=yes
-     ;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
-     targ_defvec=bfd_elf32_i386_vec
-     targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
-     targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -543,7 +543,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-*)
-     targ_defvec=bfd_elf64_x86_64_vec
-     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
-     ;;
-@@ -719,7 +719,7 @@
-     targ_selvecs=bfd_elf32_m68k_vec
-     targ_underscore=yes
-     ;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
-     targ_defvec=bfd_elf32_m68k_vec
-     targ_selvecs=m68klinux_vec
-     ;;
-@@ -1005,7 +1005,7 @@
-     ;;
- #endif
-   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
--  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-+  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
-   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
-     targ_defvec=bfd_elf32_powerpc_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -1042,7 +1042,7 @@
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-     ;;
-   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
--  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
-+  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
-   powerpcle-*-rtems*)
-     targ_defvec=bfd_elf32_powerpcle_vec
-     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-@@ -1213,7 +1213,7 @@
-     targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
-     targ_underscore=yes
-     ;;
--  sparc-*-linux-gnu*)
-+  sparc-*-linux-*)
-     targ_defvec=bfd_elf32_sparc_vec
-     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
-     ;;
-@@ -1260,7 +1260,7 @@
-     targ_defvec=sunos_big_vec
-     targ_underscore=yes
-     ;;
--  sparc64-*-linux-gnu*)
-+  sparc64-*-linux-*)
-     targ_defvec=bfd_elf64_sparc_vec
-     targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
-     ;;
-@@ -1329,7 +1329,7 @@
-     targ_underscore=yes
-     ;;
- 
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
-     targ_defvec=bfd_elf32_vax_vec
-     ;;
- 
-diff -ur binutils-2.15.97.orig/bfd/configure binutils-2.15.97/bfd/configure
---- binutils-2.15.97.orig/bfd/configure	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/configure	2005-04-29 20:53:50.000000000 -0400
-@@ -9918,7 +9918,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -9982,7 +9982,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
- 	;;
-@@ -10020,7 +10020,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -10154,7 +10154,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
-diff -ur binutils-2.15.97.orig/bfd/configure.in binutils-2.15.97/bfd/configure.in
---- binutils-2.15.97.orig/bfd/configure.in	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/bfd/configure.in	2005-04-29 20:53:50.000000000 -0400
-@@ -163,7 +163,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
- 	COREFILE=''
- 	;;
--  alpha*-*-linux-gnu*)
-+  alpha*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/alphalinux.h"'
- 	;;
-@@ -248,7 +248,7 @@
- 	TRAD_HEADER='"hosts/i386mach3.h"'
- 	;;
- changequote(,)dnl
--  i[3-7]86-*-linux-gnu*)
-+  i[3-7]86-*-linux-*)
- changequote([,])dnl
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386linux.h"'
-@@ -289,7 +289,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/hp300bsd.h"'
- 	;;
--  m68*-*-linux-gnu*)
-+  m68*-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/m68klinux.h"'
- 	;;
-@@ -375,7 +375,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxult2.h"'
- 	;;
--  vax-*-linux-gnu*)
-+  vax-*-linux-*)
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/vaxlinux.h"'
- 	;;
-diff -ur binutils-2.15.97.orig/gas/configure binutils-2.15.97/gas/configure
---- binutils-2.15.97.orig/gas/configure	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure	2005-04-29 20:53:50.000000000 -0400
-@@ -4462,7 +4462,7 @@
- _ACEOF
- 
- 	;;
--      ppc-*-linux-gnu*)
-+      ppc-*-linux-*)
- 	case "$endian" in
- 	  big)  ;;
- 	  *)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
-diff -ur binutils-2.15.97.orig/gas/configure.in binutils-2.15.97/gas/configure.in
---- binutils-2.15.97.orig/gas/configure.in	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure.in	2005-04-29 20:53:50.000000000 -0400
-@@ -161,7 +161,7 @@
- 	AC_DEFINE(AIX_WEAK_SUPPORT, 1,
- 		  [Define if using AIX 5.2 value for C_WEAKEXT.])
- 	;;
--      ppc-*-linux-gnu*)
-+      ppc-*-linux-*)
- 	case "$endian" in
- 	  big)  ;;
- 	  *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-diff -ur binutils-2.15.97.orig/gas/configure.tgt binutils-2.15.97/gas/configure.tgt
---- binutils-2.15.97.orig/gas/configure.tgt	2005-04-29 20:48:14.000000000 -0400
-+++ binutils-2.15.97/gas/configure.tgt	2005-04-29 20:53:50.000000000 -0400
-@@ -100,7 +100,7 @@
-   alpha-*-*vms*)			fmt=evax ;;
-   alpha-*-osf*)				fmt=ecoff ;;
-   alpha-*-linuxecoff*)			fmt=ecoff ;;
--  alpha-*-linux-gnu*)			fmt=elf em=linux ;;
-+  alpha-*-linux-*)			fmt=elf em=linux ;;
-   alpha-*-netbsd*)			fmt=elf em=nbsd ;;
-   alpha-*-openbsd*)			fmt=elf em=obsd ;;
- 
-@@ -116,7 +116,7 @@
-   arm-*-conix*)				fmt=elf ;;
-   arm-*-linux*aout*)			fmt=aout em=linux ;;
-   arm-*-linux-gnueabi*)			fmt=elf  em=armlinuxeabi ;;	 
--  arm-*-linux-gnu*)			fmt=elf  em=linux ;;
-+  arm-*-linux-*)			fmt=elf  em=linux ;;
-   arm-*-uclinux*)			fmt=elf  em=linux ;;
-   arm-*-netbsdelf*)                 	fmt=elf  em=nbsd ;;
-   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -128,7 +128,7 @@
- 
-   avr-*-*)				fmt=elf ;;
- 
--  cris-*-linux-gnu* | crisv32-*-linux-gnu*)
-+  cris-*-linux-* | crisv32-*-linux-*)
- 					fmt=multi bfd_gas=yes em=linux ;;
-   cris-*-* | crisv32-*-*)		fmt=multi bfd_gas=yes ;;
- 
-@@ -192,7 +192,7 @@
-   i386-*-linux*aout*)			fmt=aout em=linux ;;
-   i386-*-linux*oldld)			fmt=aout em=linux ;;
-   i386-*-linux*coff*)			fmt=coff em=linux ;;
--  i386-*-linux-gnu*)			fmt=elf em=linux ;;
-+  i386-*-linux-*)			fmt=elf em=linux ;;
-   i386-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
-   i386-*-sysv[45]*)			fmt=elf ;;
-   i386-*-solaris*)			fmt=elf ;;
-@@ -238,7 +238,7 @@
- 
-   ia64-*-elf*)				fmt=elf ;;
-   ia64-*-aix*)				fmt=elf em=ia64aix ;;
--  ia64-*-linux-gnu*)			fmt=elf em=linux ;;
-+  ia64-*-linux-*)			fmt=elf em=linux ;;
-   ia64-*-hpux*)				fmt=elf em=hpux ;;
-   ia64-*-netbsd*)			fmt=elf em=nbsd ;;
- 
-@@ -265,7 +265,7 @@
-   m68k-*-rtems*)			fmt=elf ;;
-   m68k-*-hpux*)				fmt=hp300 em=hp300 ;;
-   m68k-*-linux*aout*)			fmt=aout em=linux ;;
--  m68k-*-linux-gnu*)			fmt=elf em=linux ;;
-+  m68k-*-linux-*)			fmt=elf em=linux ;;
-   m68k-*-uclinux*)			fmt=elf ;;
-   m68k-*-gnu*)				fmt=elf ;;
-   m68k-*-netbsdelf*)			fmt=elf em=nbsd ;;
-@@ -332,7 +332,7 @@
-   ppc-*-beos*)				fmt=coff ;;
-   ppc-*-*n*bsd* | ppc-*-elf*)		fmt=elf ;;
-   ppc-*-eabi* | ppc-*-sysv4*)		fmt=elf ;;
--  ppc-*-linux-gnu*)			fmt=elf em=linux ;;
-+  ppc-*-linux-*)			fmt=elf em=linux ;;
-   ppc-*-solaris*)			fmt=elf ;;
-   ppc-*-rtems*)				fmt=elf ;;
-   ppc-*-macos*)				fmt=coff em=macos ;;
-@@ -340,7 +340,7 @@
-   ppc-*-kaos*)				fmt=elf ;;
-   ppc-*-lynxos*)			fmt=elf em=lynx bfd_gas=yes ;;
- 
--  s390-*-linux-gnu*)			fmt=elf em=linux ;;
-+  s390-*-linux-*)			fmt=elf em=linux ;;
-   s390-*-tpf*)				fmt=elf ;;
- 
-   sh*-*-linux*)				fmt=elf em=linux
-@@ -369,7 +369,7 @@
-   sparc-*-aout | sparc*-*-vxworks*)	fmt=aout em=sparcaout ;;
-   sparc-*-coff)				fmt=coff ;;
-   sparc-*-linux*aout*)			fmt=aout em=linux ;;
--  sparc-*-linux-gnu*)			fmt=elf em=linux ;;
-+  sparc-*-linux-*)			fmt=elf em=linux ;;
-   sparc-fujitsu-none)			fmt=aout ;;
-   sparc-*-elf)				fmt=elf ;;
-   sparc-*-sysv4*)			fmt=elf ;;
-@@ -398,7 +398,7 @@
-   vax-*-netbsdelf*)			fmt=elf em=nbsd ;;
-   vax-*-netbsd*)			fmt=aout em=nbsd ;;
-   vax-*-bsd* | vax-*-ultrix*)		fmt=aout ;;
--  vax-*-linux-gnu*)			fmt=elf em=linux bfd_gas=yes ;;
-+  vax-*-linux-*)			fmt=elf em=linux bfd_gas=yes ;;
- 
-   w65-*-*)				fmt=coff ;;
- 
-diff -ur binutils-2.15.97.orig/ld/configure.host binutils-2.15.97/ld/configure.host
---- binutils-2.15.97.orig/ld/configure.host	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/configure.host	2005-04-29 20:53:50.000000000 -0400
-@@ -83,7 +83,7 @@
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
-   ;;
- 
--arm*-*-linux-gnu*)
-+arm*-*-linux-*)
-   HOSTING_CRT0='-p '`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
-   ;;
- 
-@@ -141,7 +141,7 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' -lcygwin -L/usr/lib/w32api -luser32 -lkernel32 -ladvapi32 -lshell32 `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi`'
-   ;;
- 
--ia64-*-linux-gnu*)
-+ia64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]*\*,ld-linux-ia64,g"`
-   ;;
- 
-@@ -155,11 +155,11 @@
-   HOSTING_LIBS='-L/usr/lib32 '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o ; else ${CC} -print-file-name=crtend.o; fi` /usr/lib32/crtn.o -init __do_global_ctors -fini __do_global_dtors'
-   ;;
- 
--mips*-*-linux-gnu*)
-+mips*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
--m68*-*-linux-gnu*)
-+m68*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
-@@ -183,19 +183,19 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi`'
-   ;;
- 
--powerpc64*-*-linux-gnu*)
-+powerpc64*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld64.so.1,"`
-   ;;
- 
--powerpc*-*-linux-gnu*)
-+powerpc*-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
--s390x-*-linux-gnu*)
-+s390x-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld64.so.1,"`
-   ;;
- 
--s390-*-linux-gnu*)
-+s390-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
-   ;;
- 
-@@ -209,15 +209,15 @@
-   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
-   ;;
- 
--sparc-*-linux-gnu*)
-+sparc-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld-linux.so.2,"`
-   ;;
- 
--sparc64-*-linux-gnu*)
-+sparc64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux.so.2,"`
-   ;;
- 
--x86_64-*-linux-gnu*)
-+x86_64-*-linux-*)
-   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux-x86-64.so.2,"`
-   ;;
- 
-diff -ur binutils-2.15.97.orig/ld/configure.tgt binutils-2.15.97/ld/configure.tgt
---- binutils-2.15.97.orig/ld/configure.tgt	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/configure.tgt	2005-04-29 20:53:50.000000000 -0400
-@@ -30,7 +30,7 @@
- cris-*-*aout*)		targ_emul=crisaout
- 			targ_extra_emuls="criself crislinux"
- 			targ_extra_libpath=$targ_extra_emuls ;;
--cris-*-linux-gnu* | cris-*-linux-gnu*)
-+cris-*-linux-* | crisv32-*-linux-*)
- 			targ_emul=crislinux ;;
- cris-*-* | crisv32-*-*)	targ_emul=criself
- 			targ_extra_emuls="crisaout crislinux"
-@@ -62,14 +62,14 @@
- 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
- 			tdir_sun4=sparc-sun-sunos4
- 			;;
--sparc64-*-linux-gnu*)	targ_emul=elf64_sparc
-+sparc64-*-linux-*)	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-*)	targ_emul=elf32_sparc
- 			targ_extra_emuls="sparclinux elf64_sparc sun4"
- 			targ_extra_libpath=elf64_sparc
- 			tdir_sparclinux=${targ_alias}aout
-@@ -119,8 +119,8 @@
- ia64-*-aix*)		targ_emul=elf64_aix ;;
- m32r*le-*-elf*)         targ_emul=m32rlelf ;;
- m32r*-*-elf*)           targ_emul=m32relf ;;
--m32r*le-*-linux-gnu*)   targ_emul=m32rlelf_linux ;;
--m32r*-*-linux-gnu*)     targ_emul=m32relf_linux ;;
-+m32r*le-*-linux-*)      targ_emul=m32rlelf_linux ;;
-+m32r*-*-linux-*)        targ_emul=m32relf_linux ;;
- m68hc11-*-*|m6811-*-*)	targ_emul=m68hc11elf 
- 			targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;
- m68hc12-*-*|m6812-*-*)	targ_emul=m68hc12elf 
-@@ -131,7 +131,7 @@
- m68*-apple-aux*)	targ_emul=m68kaux ;;
- maxq-*-coff)            targ_emul=maxqcoff;;
- *-tandem-none)		targ_emul=st2000 ;;
--i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
-+i370-*-elf* | i370-*-linux-*) 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 ;;
-@@ -155,14 +155,14 @@
- 			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-*)	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-*)	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/'`
-@@ -262,13 +262,13 @@
- arm-*-kaos*)		targ_emul=armelf ;;
- arm9e-*-elf)		targ_emul=armelf ;;
- arm*b-*-linux-gnueabi)	targ_emul=armelfb_linux_eabi ;;
--arm*b-*-linux-gnu*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
-+arm*b-*-linux-*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
- arm*-*-linux-gnueabi)	targ_emul=armelf_linux_eabi ;;
--arm*-*-linux-gnu*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+arm*-*-linux-*)	        targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm*-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
- arm-*-vxworks)		targ_emul=armelf_vxworks ;;
- arm*-*-conix*)		targ_emul=armelf ;;
--thumb-*-linux-gnu* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-+thumb-*-linux-* | 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 ;;
-@@ -372,7 +372,7 @@
- 			targ_extra_emuls=m68kelf
- 			tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
- 			;;
--m68k-*-linux-gnu*)	targ_emul=m68kelf
-+m68k-*-linux-*) 	targ_emul=m68kelf
- 			targ_extra_emuls=m68klinux
- 			tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
- 			;;
-@@ -388,9 +388,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-*)	targ_emul=hppa64linux ;;
- hppa*64*-*)		targ_emul=elf64hppa ;;
--hppa*-*-linux-gnu*)	targ_emul=hppalinux ;;
-+hppa*-*-linux-*)	targ_emul=hppalinux ;;
- hppa*-*-*elf*)		targ_emul=hppaelf ;;
- hppa*-*-lites*)		targ_emul=hppaelf ;;
- hppa*-*-netbsd*)	targ_emul=hppanbsd ;;
-@@ -402,7 +402,7 @@
- vax-*-netbsdaout* | vax-*-netbsd*)
- 			targ_emul=vaxnbsd
- 			targ_extra_emuls=elf32vax ;;
--vax-*-linux-gnu*)	targ_emul=elf32vax ;;
-+vax-*-linux-*)  	targ_emul=elf32vax ;;
- mips*-*-pe)		targ_emul=mipspe ;
- 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
- mips*-dec-ultrix*)	targ_emul=mipslit ;;
-@@ -436,18 +436,18 @@
- mips*-*-vxworks*)	targ_emul=elf32ebmip
- 		        targ_extra_emuls="elf32elmip" ;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss ;;
--mips64*el-*-linux-gnu*)	targ_emul=elf32ltsmipn32
-+mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
- 			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
- 			targ_extra_libpath="elf32ltsmip elf64ltsmip"
- 			;;
--mips64*-*-linux-gnu*)	targ_emul=elf32btsmipn32
-+mips64*-*-linux-*)	targ_emul=elf32btsmipn32
- 			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
- 			targ_extra_libpath="elf32btsmip elf64btsmip"
- 			;;
--mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
-+mips*el-*-linux-*)	targ_emul=elf32ltsmip
- 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
- 			;;
--mips*-*-linux-gnu*)	targ_emul=elf32btsmip
-+mips*-*-linux-*)	targ_emul=elf32btsmip
- 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
- 			;;
- mips*-*-lnews*)		targ_emul=mipslnews ;;
-@@ -467,7 +467,7 @@
- alpha*-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha
- 			tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'`
- 			;;
--alpha*-*-linux-gnu*)	targ_emul=elf64alpha targ_extra_emuls=alpha
-+alpha*-*-linux-*)	targ_emul=elf64alpha targ_extra_emuls=alpha
- 			tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
- 			;;
- alpha*-*-osf*)		targ_emul=alpha ;;
-diff -ur binutils-2.15.97.orig/ld/emultempl/elf32.em binutils-2.15.97/ld/emultempl/elf32.em
---- binutils-2.15.97.orig/ld/emultempl/elf32.em	2005-04-29 20:48:15.000000000 -0400
-+++ binutils-2.15.97/ld/emultempl/elf32.em	2005-04-29 20:53:50.000000000 -0400
-@@ -65,7 +65,7 @@
- 
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-   cat >>e${EMULATION_NAME}.c <<EOF
- #ifdef HAVE_GLOB
- #include <glob.h>
-@@ -350,7 +350,7 @@
- 
- EOF
- case ${target} in
--  *-*-linux-gnu*)
-+  *-*-linux-*)
-     cat >>e${EMULATION_NAME}.c <<EOF
- 	  {
- 	    struct bfd_link_needed_list *l;
-@@ -522,7 +522,7 @@
- 
- EOF
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- /* For a native linker, check the file /etc/ld.so.conf for directories
-    in which we may find shared libraries.  /etc/ld.so.conf is really
-@@ -932,7 +932,7 @@
- EOF
- if [ "x${USE_LIBPATH}" = xyes ] ; then
-   case ${target} in
--    *-*-linux-gnu*)
-+    *-*-linux-*)
-       cat >>e${EMULATION_NAME}.c <<EOF
- 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
- 	    break;
diff --git a/openwrt/toolchain/binutils/2.16/110-uclibc-libtool-conf.patch b/openwrt/toolchain/binutils/2.16/110-uclibc-libtool-conf.patch
deleted file mode 100644
index ec38caa125..0000000000
--- a/openwrt/toolchain/binutils/2.16/110-uclibc-libtool-conf.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff -urN binutils-2.16.90.0.2-dist/bfd/configure binutils-2.16.90.0.2/bfd/configure
---- binutils-2.16.90.0.2-dist/bfd/configure	2005-04-29 12:50:24.000000000 -0500
-+++ binutils-2.16.90.0.2/bfd/configure	2005-04-30 11:34:59.246377032 -0500
-@@ -3584,6 +3584,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/binutils/configure binutils-2.16.90.0.2/binutils/configure
---- binutils-2.16.90.0.2-dist/binutils/configure	2005-04-29 12:50:26.000000000 -0500
-+++ binutils-2.16.90.0.2/binutils/configure	2005-04-30 11:35:28.900868864 -0500
-@@ -1577,6 +1577,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/configure binutils-2.16.90.0.2/configure
---- binutils-2.16.90.0.2-dist/configure	2005-04-29 12:50:23.000000000 -0500
-+++ binutils-2.16.90.0.2/configure	2005-04-30 11:31:12.525843792 -0500
-@@ -1111,7 +1111,7 @@
-     ;;
- "")
-     case "${target}" in
--    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
-         # Enable libmudflap by default in GNU and friends.
- 	;;
-     *-*-freebsd*)
-diff -urN binutils-2.16.90.0.2-dist/configure.in binutils-2.16.90.0.2/configure.in
---- binutils-2.16.90.0.2-dist/configure.in	2005-04-29 12:50:23.000000000 -0500
-+++ binutils-2.16.90.0.2/configure.in	2005-04-30 11:29:51.643139832 -0500
-@@ -328,7 +328,7 @@
-     ;;
- "")
-     case "${target}" in
--    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
-+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)
-         # Enable libmudflap by default in GNU and friends.
- 	;;
-     *-*-freebsd*)
-diff -urN binutils-2.16.90.0.2-dist/gas/configure binutils-2.16.90.0.2/gas/configure
---- binutils-2.16.90.0.2-dist/gas/configure	2005-04-29 12:50:27.000000000 -0500
-+++ binutils-2.16.90.0.2/gas/configure	2005-04-30 11:35:21.097055224 -0500
-@@ -3421,6 +3421,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp
---- binutils-2.16.90.0.2-dist/gas/testsuite/gas/sh/basic.exp	2005-04-09 14:03:14.000000000 -0500
-+++ binutils-2.16.90.0.2/gas/testsuite/gas/sh/basic.exp	2005-04-30 11:41:57.301822944 -0500
-@@ -20,7 +20,7 @@
- 
- # Written by Cygnus Support.
- 
--if [istarget "sh*-*-linux-gnu"] {
-+if {[istarget "sh*-*-linux-gnu"] || [istarget "sh*-*-linux-uclibc"]} {
-     global ASFLAGS
-     set ASFLAGS "$ASFLAGS -big"
- }
-diff -urN binutils-2.16.90.0.2-dist/gprof/configure binutils-2.16.90.0.2/gprof/configure
---- binutils-2.16.90.0.2-dist/gprof/configure	2005-04-29 12:50:29.000000000 -0500
-+++ binutils-2.16.90.0.2/gprof/configure	2005-04-30 11:35:36.880655752 -0500
-@@ -3419,6 +3419,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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ld/configure binutils-2.16.90.0.2/ld/configure
---- binutils-2.16.90.0.2-dist/ld/configure	2005-04-29 12:50:30.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/configure	2005-04-30 11:46:15.974498720 -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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp
---- binutils-2.16.90.0.2-dist/ld/testsuite/ld-sh/sh.exp	2005-04-09 14:03:29.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/testsuite/ld-sh/sh.exp	2005-04-30 11:45:07.890849008 -0500
-@@ -62,7 +62,7 @@
- 
- set testsrec "SH relaxing to S-records"
- 
--if [istarget sh*-linux-gnu] {
-+if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
-     # This target needs the explicit entry address.
-     catch "exec $objdump -x tmpdir/sh1 | grep start\\ address | sed s/start\\ address//" entry_addr
-     set srec_relax_arg "-Ttext $entry_addr -relax --oformat srec tmpdir/sh1.o"
-@@ -117,7 +117,7 @@
-     return
- }
- 
--if [istarget sh*-linux-gnu] {
-+if {[istarget sh*-linux-gnu] || [istarget sh*-*-linux-uclibc]} {
-     exec sed -e s/_main/main/ -e s/_trap/trap/ -e s/_stack/stack/ \
- 	    < $srcdir/$subdir/start.s >tmpdir/start.s
- } else {
-diff -urN binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp
---- binutils-2.16.90.0.2-dist/ld/testsuite/ld-srec/srec.exp	2005-04-29 12:50:30.000000000 -0500
-+++ binutils-2.16.90.0.2/ld/testsuite/ld-srec/srec.exp	2005-04-30 11:44:26.358162936 -0500
-@@ -385,7 +385,7 @@
- setup_xfail "v850*-*-elf"
- 
- # The S-record linker doesn't handle Alpha Elf relaxation.
--setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
-+setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
- setup_xfail "alpha*-*-netbsd*"
- 
- # The S-record linker hasn't any hope of coping with HPPA relocs.
-@@ -424,7 +424,7 @@
- setup_xfail "thumb-*-*"
- setup_xfail "powerpc*-*-eabi*"
- setup_xfail "v850*-*-elf"
--setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*"
-+setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" "alpha*-*-linux-uclibc*"
- setup_xfail "alpha*-*-netbsd*"
- setup_xfail "hppa*-*-*"
- setup_xfail "ia64-*-*"
-diff -urN binutils-2.16.90.0.2-dist/libtool.m4 binutils-2.16.90.0.2/libtool.m4
---- binutils-2.16.90.0.2-dist/libtool.m4	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.16.90.0.2/libtool.m4	2005-04-30 11:35:54.062043784 -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* | knetbsd*-gnu)
-   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.16.90.0.2-dist/ltconfig binutils-2.16.90.0.2/ltconfig
---- binutils-2.16.90.0.2-dist/ltconfig	2004-11-22 14:33:30.000000000 -0600
-+++ binutils-2.16.90.0.2/ltconfig	2005-04-30 11:22:10.594229920 -0500
-@@ -602,6 +602,7 @@
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
-+linux-uclibc*) ;;
- linux-gnu*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-@@ -1270,6 +1271,23 @@
-   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.
-+  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.16.90.0.2-dist/opcodes/configure binutils-2.16.90.0.2/opcodes/configure
---- binutils-2.16.90.0.2-dist/opcodes/configure	2005-04-29 12:50:31.000000000 -0500
-+++ binutils-2.16.90.0.2/opcodes/configure	2005-04-30 11:17:07.168357664 -0500
-@@ -3588,6 +3588,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* | knetbsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
diff --git a/openwrt/toolchain/binutils/2.16/300-001_ld_makefile_patch.patch b/openwrt/toolchain/binutils/2.16/300-001_ld_makefile_patch.patch
deleted file mode 100644
index b25d5b7e21..0000000000
--- a/openwrt/toolchain/binutils/2.16/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-## 001_ld_makefile_patch.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: correct where ld scripts are installed
-## DP: Author: Chris Chimelis <chris@debian.org>
-## DP: Upstream status: N/A
-## DP: Date: ??
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am binutils-2.14.90.0.6/ld/Makefile.am
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.am	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.am	2003-09-10 23:12:09.000000000 +0100
-@@ -19,7 +19,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in binutils-2.14.90.0.6/ld/Makefile.in
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/ld/Makefile.in	2003-08-21 16:28:48.000000000 +0100
-+++ binutils-2.14.90.0.6/ld/Makefile.in	2003-09-10 23:12:09.000000000 +0100
-@@ -128,7 +128,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
diff --git a/openwrt/toolchain/binutils/2.16/300-006_better_file_error.patch b/openwrt/toolchain/binutils/2.16/300-006_better_file_error.patch
deleted file mode 100644
index f337611edf..0000000000
--- a/openwrt/toolchain/binutils/2.16/300-006_better_file_error.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Specify which filename is causing an error if the filename is a
-## DP: directory. (#45832)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
-+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
-@@ -150,6 +150,13 @@
- {
-   bfd *nbfd;
-   const bfd_target *target_vec;
-+  struct stat s;
-+
-+  if (stat (filename, &s) == 0)
-+    if (S_ISDIR(s.st_mode)) {
-+      bfd_set_error (bfd_error_file_not_recognized);
-+      return NULL;
-+    }
- 
-   nbfd = _bfd_new_bfd ();
-   if (nbfd == NULL)
diff --git a/openwrt/toolchain/binutils/2.16/300-012_check_ldrunpath_length.patch b/openwrt/toolchain/binutils/2.16/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index 498651a90c..0000000000
--- a/openwrt/toolchain/binutils/2.16/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
-## DP: cases where -rpath isn't specified. (#151024)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -871,6 +873,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
diff --git a/openwrt/toolchain/binutils/2.16/702-binutils-skip-comments.patch b/openwrt/toolchain/binutils/2.16/702-binutils-skip-comments.patch
deleted file mode 100644
index 9ef7a7c9ec..0000000000
--- a/openwrt/toolchain/binutils/2.16/702-binutils-skip-comments.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html
-Fixes
-localealias.s:544: Error: junk at end of line, first unrecognized character is `,' 
-when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3
-
-Paths adjusted to match crosstool's patcher.
-
-Message-Id: m3n052qw2g.fsf@whitebox.m5r.de
-From: Andreas Schwab <schwab at suse dot de>
-To: Nathan Sidwell <nathan at codesourcery dot com>
-Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com
-Date: Fri, 23 Apr 2004 22:27:19 +0200
-Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line
-
-Nathan Sidwell <nathan@codesourcery.com> writes:
-
-> Index: read.c
-> ===================================================================
-> RCS file: /cvs/src/src/gas/read.c,v
-> retrieving revision 1.76
-> diff -c -3 -p -r1.76 read.c
-> *** read.c	12 Mar 2004 17:48:12 -0000	1.76
-> --- read.c	18 Mar 2004 09:56:05 -0000
-> *************** read_a_source_file (char *name)
-> *** 1053,1059 ****
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  ignore_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-> --- 1053,1059 ----
->   #endif
->   	  input_line_pointer--;
->   	  /* Report unknown char as ignored.  */
-> ! 	  demand_empty_rest_of_line ();
->   	}
->   
->   #ifdef md_after_pass_hook
-
-This means that the unknown character is no longer ignored, despite the
-comment.  As a side effect a line starting with a line comment character
-not followed by APP in NO_APP mode now triggers an error instead of just a
-warning, breaking builds of glibc on m68k-linux.  Earlier in
-read_a_source_file where #APP is handled there is another comment that
-claims that unknown comments are ignored, when in fact they aren't (only
-the initial line comment character is skipped).
-
-Note that the presence of #APP will mess up the line counters, but
-that appears to be difficult to fix.
-
-Andreas.
-
-2004-04-23  Andreas Schwab  <schwab@suse.de>
-
-	* read.c (read_a_source_file): Ignore unknown text after line
-	comment character.  Fix misleading comment.
-
---- binutils/gas/read.c.~1.78.~	2004-04-23 08:58:23.000000000 +0200
-+++ binutils/gas/read.c	2004-04-23 21:49:01.000000000 +0200
-@@ -950,10 +950,14 @@ read_a_source_file (char *name)
- 	      unsigned int new_length;
- 	      char *tmp_buf = 0;
- 
--	      bump_line_counters ();
- 	      s = input_line_pointer;
- 	      if (strncmp (s, "APP\n", 4))
--		continue;	/* We ignore it */
-+		{
-+		  /* We ignore it */
-+		  ignore_rest_of_line ();
-+		  continue;
-+		}
-+	      bump_line_counters ();
- 	      s += 4;
- 
- 	      sb_new (&sbuf);
-@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
- 	    continue;
- #endif
- 	  input_line_pointer--;
--	  /* Report unknown char as ignored.  */
-+	  /* Report unknown char as error.  */
- 	  demand_empty_rest_of_line ();
- 	}
- 
-
--- 
-Andreas Schwab, SuSE Labs, schwab@suse.de
-SuSE Linux AG, Maxfeldstra&#xC3;e 5, 90409 N&#xC3;rnberg, Germany
-Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
-"And now for something completely different."
diff --git a/openwrt/toolchain/binutils/Config.in b/openwrt/toolchain/binutils/Config.in
index 2c0b4f8e15..762bf1d62a 100644
--- a/openwrt/toolchain/binutils/Config.in
+++ b/openwrt/toolchain/binutils/Config.in
@@ -10,21 +10,9 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_15
-		bool "binutils 2.15"
-
 	config BR2_BINUTILS_VERSION_2_15_94_0_2
 		bool "binutils 2.15.94.0.2"
 
-	config BR2_BINUTILS_VERSION_2_15_94_0_2_2
-		bool "binutils 2.15.94.0.2.2"
-
-	config BR2_BINUTILS_VERSION_2_15_97
-		bool "binutils 2.15.97"
-
-	config BR2_BINUTILS_VERSION_2_16
-		bool "binutils 2.16"
-
 	config BR2_BINUTILS_VERSION_2_16_1
 		bool "binutils 2.16.1"
 
@@ -42,11 +30,7 @@ endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "2.15"            if BR2_BINUTILS_VERSION_2_15
 	default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
-	default "2.15.94.0.2.2"   if BR2_BINUTILS_VERSION_2_15_94_0_2_2
-	default "2.15.97"         if BR2_BINUTILS_VERSION_2_15_97
-	default "2.16"            if BR2_BINUTILS_VERSION_2_16
 	default "2.16.1"          if BR2_BINUTILS_VERSION_2_16_1 || !CONFIG_DEVEL
 	default "2.16.90.0.3"     if BR2_BINUTILS_VERSION_2_16_90_0_3
 	default "2.16.91.0.1"     if BR2_BINUTILS_VERSION_2_16_91_0_1
diff --git a/openwrt/toolchain/binutils/Makefile b/openwrt/toolchain/binutils/Makefile
index 2a1c728dbb..1b205715e3 100644
--- a/openwrt/toolchain/binutils/Makefile
+++ b/openwrt/toolchain/binutils/Makefile
@@ -23,18 +23,6 @@ BINUTILS_STABLE_SITE:=http://ftp.gnu.org/gnu/binutils/ \
 ifeq ($(BINUTILS_VERSION),2.16.1)
 BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
 endif
-ifeq ($(BINUTILS_VERSION),2.16)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
-endif
-ifeq ($(BINUTILS_VERSION),2.15)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
-endif
-ifeq ($(BINUTILS_VERSION),2.14)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
-endif
-ifeq ($(BINUTILS_VERSION),2.13)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
-endif
 
 BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
author	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2005-10-21 17:30:24 +0000
committer	nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2005-10-21 17:30:24 +0000
commit	f4b98ea359bc59f1d3c56fbef2ad942eb6bf557b (patch)
tree	9aa3f32e945047430c55bdfb1bea937cba7be1ed /openwrt/toolchain/binutils
parent	e792a6d076dd25b2b85f37b859bf2cc362429694 (diff)