Update binutils. This version works on arm...

1 files changed, 103 insertions, 103 deletions

diff --git a/sources/binutils-uclibc-100-conf.patch b/sources/binutils-uclibc-100-conf.patch
index 6e36af229..87db23fb0 100644
--- a/sources/binutils-uclibc-100-conf.patch
+++ b/sources/binutils-uclibc-100-conf.patch
@@ -1,6 +1,6 @@
-diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/config.bfd
---- binutils-2.14.90.0.7.orig/bfd/config.bfd	2003-10-29 10:37:47.000000000 -0700
-+++ binutils-2.14.90.0.7/bfd/config.bfd	2004-04-20 01:37:12.000000000 -0600
+diff -urN binutils-2.14.90.0.6/bfd/config.bfd binutils-2.14.90.0.6-uClibc/bfd/config.bfd
+--- binutils-2.14.90.0.6/bfd/config.bfd	2003-08-21 10:28:47.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/bfd/config.bfd	2004-01-06 23:20:32.000000000 -0600
 @@ -121,7 +121,7 @@
      targ_defvec=ecoffalpha_little_vec
      targ_selvecs=bfd_elf64_alpha_vec
@@ -10,16 +10,17 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf64_alpha_vec
      targ_selvecs=ecoffalpha_little_vec
      ;;
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,8 @@
    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*-*-elf* | ia64*-*-linux-uclibc* | ia64*-*-kfreebsd*-gnu)
+-  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf*)
++  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | \
++  ia64*-*-linux-uclibc* | ia64*-*-elf*)
      targ_defvec=bfd_elf64_ia64_little_vec
      targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
      ;;
-@@ -214,7 +214,7 @@
+@@ -214,7 +215,7 @@
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
@@ -28,16 +29,17 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf32_bigarm_vec
      targ_selvecs=bfd_elf32_littlearm_vec
      ;;
-@@ -222,7 +222,7 @@
+@@ -222,7 +223,8 @@
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
--  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu)
-+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux* | arm*-*-linux-uclibc* | arm-*-kfreebsd*-gnu)
+-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux*)
++  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | \
++  arm*-*-conix* | arm*-*-uclinux*)
      targ_defvec=bfd_elf32_littlearm_vec
      targ_selvecs=bfd_elf32_bigarm_vec
      ;;
-@@ -355,7 +355,7 @@
+@@ -355,7 +357,7 @@
      ;;
  
  #ifdef BFD64
@@ -46,16 +48,16 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf64_hppa_linux_vec
      targ_selvecs=bfd_elf64_hppa_vec
      ;;
-@@ -366,7 +366,7 @@
+@@ -366,7 +368,7 @@
      ;;
  #endif
  
--  hppa*-*-linux-gnu* | hppa*-*-netbsd*)
-+  hppa*-*-linux-gnu* | hppa*-*-netbsd* | hppa*-*-linux-uclibc*)
+-  hppa*-*-linux-gnu*)
++  hppa*-*-linux-gnu* | hppa*-*-linux-uclibc*)
      targ_defvec=bfd_elf32_hppa_linux_vec
      targ_selvecs=bfd_elf32_hppa_vec
      ;;
-@@ -488,7 +488,7 @@
+@@ -488,7 +490,7 @@
      targ_selvecs=bfd_elf32_i386_vec
      targ_underscore=yes
      ;;
@@ -64,7 +66,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf32_i386_vec
      targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
      targ64_selvecs=bfd_elf64_x86_64_vec
-@@ -502,7 +502,7 @@
+@@ -502,7 +504,7 @@
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
      ;;
@@ -73,7 +75,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf64_x86_64_vec
      targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
      ;;
-@@ -662,7 +662,7 @@
+@@ -662,7 +664,7 @@
      targ_selvecs=bfd_elf32_m68k_vec
      targ_underscore=yes
      ;;
@@ -82,7 +84,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf32_m68k_vec
      targ_selvecs=m68klinux_vec
      ;;
-@@ -929,7 +929,8 @@
+@@ -929,7 +931,8 @@
      ;;
  #endif
    powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
@@ -92,7 +94,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
    powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
      targ_defvec=bfd_elf32_powerpc_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-@@ -961,8 +962,8 @@
+@@ -961,8 +964,8 @@
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      ;;
    powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
@@ -103,7 +105,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf32_powerpcle_vec
      targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
      targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
-@@ -1110,7 +1111,7 @@
+@@ -1110,7 +1113,7 @@
      targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
      targ_underscore=yes
      ;;
@@ -112,7 +114,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf32_sparc_vec
      targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
      ;;
-@@ -1157,7 +1158,7 @@
+@@ -1157,7 +1160,7 @@
      targ_defvec=sunos_big_vec
      targ_underscore=yes
      ;;
@@ -121,10 +123,10 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/config.bfd binutils-2.14.90.0.7/bfd/conf
      targ_defvec=bfd_elf64_sparc_vec
      targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
      ;;
-diff -urN binutils-2.14.90.0.7.orig/bfd/configure binutils-2.14.90.0.7/bfd/configure
---- binutils-2.14.90.0.7.orig/bfd/configure	2003-10-29 10:37:47.000000000 -0700
-+++ binutils-2.14.90.0.7/bfd/configure	2004-04-20 01:32:29.000000000 -0600
-@@ -1699,6 +1699,11 @@
+diff -urN binutils-2.14.90.0.6/bfd/configure binutils-2.14.90.0.6-uClibc/bfd/configure
+--- binutils-2.14.90.0.6/bfd/configure	2003-08-21 10:28:47.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/bfd/configure	2004-01-06 20:26:51.000000000 -0600
+@@ -1698,6 +1698,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
@@ -136,8 +138,8 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure binutils-2.14.90.0.7/bfd/confi
  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)
+@@ -5102,7 +5107,7 @@
+   alpha*-*-freebsd*)
  	COREFILE=''
  	;;
 -  alpha*-*-linux-gnu*)
@@ -145,7 +147,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure binutils-2.14.90.0.7/bfd/confi
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/alphalinux.h"'
  	;;
-@@ -5338,7 +5343,7 @@
+@@ -5161,7 +5166,7 @@
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/i386mach3.h"'
  	;;
@@ -154,7 +156,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure binutils-2.14.90.0.7/bfd/confi
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/i386linux.h"'
  	;;
-@@ -5388,7 +5393,7 @@
+@@ -5211,7 +5216,7 @@
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/hp300bsd.h"'
  	;;
@@ -163,11 +165,11 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure binutils-2.14.90.0.7/bfd/confi
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/m68klinux.h"'
  	;;
-diff -urN binutils-2.14.90.0.7.orig/bfd/configure.in binutils-2.14.90.0.7/bfd/configure.in
---- binutils-2.14.90.0.7.orig/bfd/configure.in	2003-10-29 10:37:47.000000000 -0700
-+++ binutils-2.14.90.0.7/bfd/configure.in	2004-04-20 01:32:29.000000000 -0600
-@@ -178,7 +178,7 @@
-   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
+diff -urN binutils-2.14.90.0.6/bfd/configure.in binutils-2.14.90.0.6-uClibc/bfd/configure.in
+--- binutils-2.14.90.0.6/bfd/configure.in	2003-08-21 10:28:47.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/bfd/configure.in	2004-01-06 20:33:02.000000000 -0600
+@@ -153,7 +153,7 @@
+   alpha*-*-freebsd*)
  	COREFILE=''
  	;;
 -  alpha*-*-linux-gnu*)
@@ -175,7 +177,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure.in binutils-2.14.90.0.7/bfd/co
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/alphalinux.h"'
  	;;
-@@ -259,7 +259,7 @@
+@@ -233,7 +233,7 @@
  	TRAD_HEADER='"hosts/i386mach3.h"'
  	;;
  changequote(,)dnl
@@ -184,7 +186,7 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure.in binutils-2.14.90.0.7/bfd/co
  changequote([,])dnl
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/i386linux.h"'
-@@ -312,7 +312,7 @@
+@@ -286,7 +286,7 @@
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/hp300bsd.h"'
  	;;
@@ -193,9 +195,9 @@ diff -urN binutils-2.14.90.0.7.orig/bfd/configure.in binutils-2.14.90.0.7/bfd/co
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/m68klinux.h"'
  	;;
-diff -urN binutils-2.14.90.0.7.orig/config.sub binutils-2.14.90.0.7/config.sub
---- binutils-2.14.90.0.7.orig/config.sub	2003-08-21 09:28:47.000000000 -0600
-+++ binutils-2.14.90.0.7/config.sub	2004-04-20 01:32:29.000000000 -0600
+diff -urN binutils-2.14.90.0.6/config.sub binutils-2.14.90.0.6-uClibc/config.sub
+--- binutils-2.14.90.0.6/config.sub	2003-08-21 10:28:47.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/config.sub	2004-01-06 22:56:56.000000000 -0600
 @@ -118,7 +118,7 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
@@ -215,11 +217,11 @@ diff -urN binutils-2.14.90.0.7.orig/config.sub binutils-2.14.90.0.7/config.sub
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-diff -urN binutils-2.14.90.0.7.orig/configure binutils-2.14.90.0.7/configure
---- binutils-2.14.90.0.7.orig/configure	2003-10-29 10:38:23.000000000 -0700
-+++ binutils-2.14.90.0.7/configure	2004-04-20 01:32:29.000000000 -0600
-@@ -1276,6 +1276,18 @@
-   i[3456789]86-*-freebsd* | i[3456789]86-*-kfreebsd*-gnu)
+diff -urN binutils-2.14.90.0.6/configure binutils-2.14.90.0.6-uClibc/configure
+--- binutils-2.14.90.0.6/configure	2003-08-21 10:29:32.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/configure	2004-01-07 05:43:40.000000000 -0600
+@@ -1257,6 +1262,18 @@
+   i[3456789]86-*-freebsd*)
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
 +  i[3456789]86-*-linux-uclibc)
@@ -237,11 +239,11 @@ diff -urN binutils-2.14.90.0.7.orig/configure binutils-2.14.90.0.7/configure
    i[3456789]86-*-linux*)
      # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
      # not build java stuff by default.
-diff -urN binutils-2.14.90.0.7.orig/configure.in binutils-2.14.90.0.7/configure.in
---- binutils-2.14.90.0.7.orig/configure.in	2003-10-29 10:38:20.000000000 -0700
-+++ binutils-2.14.90.0.7/configure.in	2004-04-20 01:32:29.000000000 -0600
-@@ -515,6 +515,19 @@
-   i[[3456789]]86-*-freebsd* | i[[3456789]]86-*-kfreebsd*-gnu)
+diff -urN binutils-2.14.90.0.6/configure.in binutils-2.14.90.0.6-uClibc/configure.in
+--- binutils-2.14.90.0.6/configure.in	2003-08-21 10:29:30.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/configure.in	2004-01-07 05:44:02.000000000 -0600
+@@ -508,6 +513,19 @@
+   i[[3456789]]86-*-freebsd*)
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
 +  i[3456789]86-*-linux-uclibc)
@@ -260,10 +262,10 @@ diff -urN binutils-2.14.90.0.7.orig/configure.in binutils-2.14.90.0.7/configure.
    i[[3456789]]86-*-linux*)
      # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
      # not build java stuff by default.
-diff -urN binutils-2.14.90.0.7.orig/demangler/configure binutils-2.14.90.0.7/demangler/configure
---- binutils-2.14.90.0.7.orig/demangler/configure	2003-10-29 10:38:20.000000000 -0700
-+++ binutils-2.14.90.0.7/demangler/configure	2004-04-20 01:32:29.000000000 -0600
-@@ -1380,6 +1380,11 @@
+diff -urN binutils-2.14.90.0.6/demangler/configure binutils-2.14.90.0.6-uClibc/demangler/configure
+--- binutils-2.14.90.0.6/demangler/configure	2003-08-21 10:29:31.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/demangler/configure	2004-01-06 21:45:51.000000000 -0600
+@@ -1363,6 +1363,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
@@ -275,10 +277,10 @@ diff -urN binutils-2.14.90.0.7.orig/demangler/configure binutils-2.14.90.0.7/dem
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/configure
---- binutils-2.14.90.0.7.orig/gas/configure	2003-10-29 10:37:48.000000000 -0700
-+++ binutils-2.14.90.0.7/gas/configure	2004-04-20 01:37:58.000000000 -0600
-@@ -3215,6 +3215,11 @@
+diff -urN binutils-2.14.90.0.6/gas/configure binutils-2.14.90.0.6-uClibc/gas/configure
+--- binutils-2.14.90.0.6/gas/configure	2003-07-23 10:08:10.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/gas/configure	2004-01-06 21:57:25.000000000 -0600
+@@ -1576,6 +1576,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
  
@@ -290,7 +292,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-@@ -4028,6 +4033,7 @@
+@@ -2370,6 +2375,7 @@
        alpha*-*-osf*)			fmt=ecoff ;;
        alpha*-*-linuxecoff*)		fmt=ecoff ;;
        alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -298,7 +300,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        alpha*-*-netbsd*)			fmt=elf em=nbsd ;;
        alpha*-*-openbsd*)		fmt=elf em=obsd ;;
  
-@@ -4044,6 +4050,7 @@
+@@ -2386,6 +2392,7 @@
        arm*-*-conix*)			fmt=elf ;;
        arm-*-linux*aout*)		fmt=aout em=linux ;;
        arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
@@ -306,7 +308,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        arm*-*-uclinux*)			fmt=elf  em=linux ;;
        arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
        arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -4058,6 +4065,7 @@
+@@ -2400,6 +2407,7 @@
        avr-*-*)				fmt=elf ;;
  
        cris-*-linux-gnu*)		fmt=multi bfd_gas=yes em=linux ;;
@@ -314,7 +316,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        cris-*-*)				fmt=multi bfd_gas=yes ;;
  
        d10v-*-*)				fmt=elf ;;
-@@ -4114,7 +4122,9 @@
+@@ -2455,7 +2463,9 @@
        i386-*-linux*oldld)		fmt=aout em=linux ;;
        i386-*-linux*coff*)		fmt=coff em=linux ;;
        i386-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -324,7 +326,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        i386-*-lynxos*)			fmt=coff em=lynx ;;
        i386-*-sysv[45]*)			fmt=elf ;;
        i386-*-solaris*)			fmt=elf ;;
-@@ -4175,6 +4185,7 @@
+@@ -2512,6 +2522,7 @@
        ia64-*-elf*)			fmt=elf ;;
        ia64-*-aix*)			fmt=elf em=ia64aix ;;
        ia64-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -332,7 +334,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        ia64-*-hpux*)			fmt=elf em=hpux ;;
        ia64-*-netbsd*)			fmt=elf em=nbsd ;;
  
-@@ -4201,6 +4212,7 @@
+@@ -2538,6 +2549,7 @@
        m68k-*-hpux*)			fmt=hp300 em=hp300 ;;
        m68k-*-linux*aout*)		fmt=aout em=linux ;;
        m68k-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -340,16 +342,15 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        m68k-*-gnu*)			fmt=elf ;;
        m68k-*-lynxos*)			fmt=coff em=lynx ;;
        m68k-*-netbsdelf*)		fmt=elf em=nbsd ;;
-@@ -4257,7 +4269,7 @@
+@@ -2592,6 +2604,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-uclibc* | ppc-*-linux-gnu*)			fmt=elf em=linux
++      ppc-*-linux-uclibc* | \
+       ppc-*-linux-gnu*)			fmt=elf
  	    case "$endian" in
  		big)  ;;
- 		*)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5
-@@ -4286,7 +4298,9 @@
+@@ -2616,7 +2629,9 @@
        ppc-*-kaos*)			fmt=elf ;;
  
        s390x-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -359,7 +360,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
  
        sh*-*-linux*)			fmt=elf em=linux
  	    case ${cpu} in
-@@ -4319,6 +4333,7 @@
+@@ -2649,6 +2664,7 @@
        sparc-*-coff)			fmt=coff ;;
        sparc-*-linux*aout*)		fmt=aout em=linux ;;
        sparc-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -367,10 +368,10 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure binutils-2.14.90.0.7/gas/confi
        sparc-*-lynxos*)			fmt=coff em=lynx ;;
        sparc-fujitsu-none)		fmt=aout ;;
        sparc-*-elf)			fmt=elf ;;
-diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/configure.in
---- binutils-2.14.90.0.7.orig/gas/configure.in	2003-10-29 10:37:48.000000000 -0700
-+++ binutils-2.14.90.0.7/gas/configure.in	2004-04-20 01:38:23.000000000 -0600
-@@ -192,6 +192,7 @@
+diff -urN binutils-2.14.90.0.6/gas/configure.in binutils-2.14.90.0.6-uClibc/gas/configure.in
+--- binutils-2.14.90.0.6/gas/configure.in	2003-07-23 10:08:10.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/gas/configure.in	2004-01-06 21:57:26.000000000 -0600
+@@ -184,6 +184,7 @@
        alpha*-*-osf*)			fmt=ecoff ;;
        alpha*-*-linuxecoff*)		fmt=ecoff ;;
        alpha*-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -378,7 +379,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        alpha*-*-netbsd*)			fmt=elf em=nbsd ;;
        alpha*-*-openbsd*)		fmt=elf em=obsd ;;
  
-@@ -208,6 +209,7 @@
+@@ -200,6 +201,7 @@
        arm*-*-conix*)			fmt=elf ;;
        arm-*-linux*aout*)		fmt=aout em=linux ;;
        arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
@@ -386,7 +387,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        arm*-*-uclinux*)			fmt=elf  em=linux ;;
        arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
        arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
-@@ -222,6 +224,7 @@
+@@ -214,6 +216,7 @@
        avr-*-*)				fmt=elf ;;
  
        cris-*-linux-gnu*)		fmt=multi bfd_gas=yes em=linux ;;
@@ -394,7 +395,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        cris-*-*)				fmt=multi bfd_gas=yes ;;
  
        d10v-*-*)				fmt=elf ;;
-@@ -278,7 +281,9 @@
+@@ -269,7 +272,9 @@
        i386-*-linux*oldld)		fmt=aout em=linux ;;
        i386-*-linux*coff*)		fmt=coff em=linux ;;
        i386-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -404,7 +405,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        i386-*-lynxos*)			fmt=coff em=lynx ;;
  changequote(,)dnl
        i386-*-sysv[45]*)			fmt=elf ;;
-@@ -332,6 +337,7 @@
+@@ -322,6 +327,7 @@
        ia64-*-elf*)			fmt=elf ;;
        ia64-*-aix*)			fmt=elf em=ia64aix ;;
        ia64-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -412,7 +413,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        ia64-*-hpux*)			fmt=elf em=hpux ;;
        ia64-*-netbsd*)			fmt=elf em=nbsd ;;
  
-@@ -358,6 +364,7 @@
+@@ -348,6 +354,7 @@
        m68k-*-hpux*)			fmt=hp300 em=hp300 ;;
        m68k-*-linux*aout*)		fmt=aout em=linux ;;
        m68k-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -420,16 +421,15 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        m68k-*-gnu*)			fmt=elf ;;
        m68k-*-lynxos*)			fmt=coff em=lynx ;;
        m68k-*-netbsdelf*)		fmt=elf em=nbsd ;;
-@@ -412,7 +419,7 @@
+@@ -402,6 +409,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-uclibc* | ppc-*-linux-gnu*)			fmt=elf em=linux
++      ppc-*-linux-uclibc* | \
+       ppc-*-linux-gnu*)			fmt=elf
  	    case "$endian" in
  		big)  ;;
- 		*)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-@@ -434,7 +441,9 @@
+@@ -424,7 +432,9 @@
        ppc-*-kaos*)			fmt=elf ;;
  
        s390x-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -439,7 +439,7 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
  
        sh*-*-linux*)			fmt=elf em=linux
  	    case ${cpu} in
-@@ -467,6 +476,7 @@
+@@ -457,6 +467,7 @@
        sparc-*-coff)			fmt=coff ;;
        sparc-*-linux*aout*)		fmt=aout em=linux ;;
        sparc-*-linux-gnu*)		fmt=elf em=linux ;;
@@ -447,9 +447,9 @@ diff -urN binutils-2.14.90.0.7.orig/gas/configure.in binutils-2.14.90.0.7/gas/co
        sparc-*-lynxos*)			fmt=coff em=lynx ;;
        sparc-fujitsu-none)		fmt=aout ;;
        sparc-*-elf)			fmt=elf ;;
-diff -urN binutils-2.14.90.0.7.orig/ld/configure binutils-2.14.90.0.7/ld/configure
---- binutils-2.14.90.0.7.orig/ld/configure	2003-05-05 15:46:49.000000000 -0600
-+++ binutils-2.14.90.0.7/ld/configure	2004-04-20 01:32:29.000000000 -0600
+diff -urN binutils-2.14.90.0.6/ld/configure binutils-2.14.90.0.6-uClibc/ld/configure
+--- binutils-2.14.90.0.6/ld/configure	2003-05-05 16:46:49.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/ld/configure	2004-01-06 21:59:31.000000000 -0600
 @@ -1578,6 +1578,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -462,9 +462,9 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure binutils-2.14.90.0.7/ld/configu
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/configure.tgt
---- binutils-2.14.90.0.7.orig/ld/configure.tgt	2003-10-29 10:37:48.000000000 -0700
-+++ binutils-2.14.90.0.7/ld/configure.tgt	2004-04-20 01:32:29.000000000 -0600
+diff -urN binutils-2.14.90.0.6/ld/configure.tgt binutils-2.14.90.0.6-uClibc/ld/configure.tgt
+--- binutils-2.14.90.0.6/ld/configure.tgt	2003-08-21 10:28:48.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/ld/configure.tgt	2004-01-06 22:09:40.000000000 -0600
 @@ -30,6 +30,7 @@
  			targ_extra_emuls="criself crislinux"
  			targ_extra_libpath=$targ_extra_emuls ;;
@@ -492,7 +492,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  			targ_extra_emuls="sparclinux elf64_sparc sun4"
  			targ_extra_libpath=elf64_sparc
  			tdir_sparclinux=${targ_alias}aout
-@@ -125,7 +128,7 @@
+@@ -124,7 +127,7 @@
  m68*-ericsson-ose)	targ_emul=sun3 ;;
  m68*-apple-aux*)	targ_emul=m68kaux ;;
  *-tandem-none)		targ_emul=st2000 ;;
@@ -501,7 +501,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  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 ;;
-@@ -149,14 +152,16 @@
+@@ -148,14 +151,16 @@
  			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'`
  			;;
  i[3-7]86-*-linux*oldld)	targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
@@ -520,7 +520,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  			targ_extra_emuls="elf_i386 i386linux"
  			targ_extra_libpath=elf_i386
  			tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
-@@ -256,10 +261,13 @@
+@@ -250,10 +255,13 @@
  arm9e-*-elf)		targ_emul=armelf ;;
  arm-*-oabi)		targ_emul=armelf_oabi ;;
  arm*b-*-linux-gnu*)	targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
@@ -535,7 +535,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  strongarm-*-coff)	targ_emul=armcoff ;;
  strongarm-*-elf)	targ_emul=armelf ;;
  strongarm-*-kaos*)	targ_emul=armelf ;;
-@@ -360,7 +368,8 @@
+@@ -354,7 +362,8 @@
  			targ_extra_emuls=m68kelf
  			tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
  			;;
@@ -545,7 +545,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  			targ_extra_emuls=m68klinux
  			tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
  			;;
-@@ -376,9 +385,9 @@
+@@ -370,9 +379,9 @@
  m68*-*-psos*)		targ_emul=m68kpsos ;;
  m68*-*-rtemscoff*)	targ_emul=m68kcoff ;;
  m68*-*-rtems*)		targ_emul=m68kelf ;;
@@ -557,7 +557,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  hppa*-*-*elf*)		targ_emul=hppaelf ;;
  hppa*-*-lites*)		targ_emul=hppaelf ;;
  hppa*-*-netbsd*)	targ_emul=hppanbsd ;;
-@@ -422,16 +431,20 @@
+@@ -416,16 +425,20 @@
  mips*-*-rtems*)		targ_emul=elf32ebmip ;;
  mips*el-*-vxworks*)	targ_emul=elf32elmip ;;
  mips*-*-vxworks*)	targ_emul=elf32ebmip ;;
@@ -582,7 +582,7 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
  			;;
  mips*-*-lnews*)		targ_emul=mipslnews ;;
-@@ -454,6 +467,10 @@
+@@ -447,6 +460,10 @@
  alpha*-*-linux-gnu*)	targ_emul=elf64alpha targ_extra_emuls=alpha
  			tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
  			;;
@@ -593,9 +593,9 @@ diff -urN binutils-2.14.90.0.7.orig/ld/configure.tgt binutils-2.14.90.0.7/ld/con
  alpha*-*-osf*)		targ_emul=alpha ;;
  alpha*-*-gnu*)		targ_emul=elf64alpha ;;
  alpha*-*-netware*)	targ_emul=alpha ;;
-diff -urN binutils-2.14.90.0.7.orig/libtool.m4 binutils-2.14.90.0.7/libtool.m4
---- binutils-2.14.90.0.7.orig/libtool.m4	2003-05-05 15:46:46.000000000 -0600
-+++ binutils-2.14.90.0.7/libtool.m4	2004-04-20 01:32:29.000000000 -0600
+diff -urN binutils-2.14.90.0.6/libtool.m4 binutils-2.14.90.0.6-uClibc/libtool.m4
+--- binutils-2.14.90.0.6/libtool.m4	2003-05-05 16:46:46.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/libtool.m4	2004-01-06 20:30:39.000000000 -0600
 @@ -645,6 +645,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -608,9 +608,9 @@ diff -urN binutils-2.14.90.0.7.orig/libtool.m4 binutils-2.14.90.0.7/libtool.m4
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-diff -urN binutils-2.14.90.0.7.orig/ltconfig binutils-2.14.90.0.7/ltconfig
---- binutils-2.14.90.0.7.orig/ltconfig	2003-10-29 10:37:47.000000000 -0700
-+++ binutils-2.14.90.0.7/ltconfig	2004-04-20 01:32:29.000000000 -0600
+diff -urN binutils-2.14.90.0.6/ltconfig binutils-2.14.90.0.6-uClibc/ltconfig
+--- binutils-2.14.90.0.6/ltconfig	2003-07-23 10:08:08.000000000 -0500
++++ binutils-2.14.90.0.6-uClibc/ltconfig	2004-01-06 21:05:11.000000000 -0600
 @@ -603,6 +603,7 @@
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  case $host_os in