Fix ld/emultempl/elf32.em. Found by vapier.

1 files changed, 44 insertions, 14 deletions

diff --git a/sources/binutils/2.15.91.0.2/100-uclibc-conf.patch b/sources/binutils/2.15.91.0.2/100-uclibc-conf.patch
index 882eef6b1..911bef4ff 100644
--- a/sources/binutils/2.15.91.0.2/100-uclibc-conf.patch
+++ b/sources/binutils/2.15.91.0.2/100-uclibc-conf.patch
@@ -1,6 +1,6 @@
 diff -urN binutils-2.15.91.0.2-dist/bfd/config.bfd binutils-2.15.91.0.2/bfd/config.bfd
 --- binutils-2.15.91.0.2-dist/bfd/config.bfd	2004-07-27 23:36:07.000000000 -0500
-+++ binutils-2.15.91.0.2/bfd/config.bfd	2004-09-10 07:35:20.000000000 -0500
++++ binutils-2.15.91.0.2/bfd/config.bfd	2004-09-28 14:33:13.000000000 -0500
 @@ -129,7 +129,7 @@
      targ_defvec=ecoffalpha_little_vec
      targ_selvecs=bfd_elf64_alpha_vec
@@ -132,7 +132,7 @@ diff -urN binutils-2.15.91.0.2-dist/bfd/config.bfd binutils-2.15.91.0.2/bfd/conf
  
 diff -urN binutils-2.15.91.0.2-dist/bfd/configure binutils-2.15.91.0.2/bfd/configure
 --- binutils-2.15.91.0.2-dist/bfd/configure	2004-07-27 23:36:07.000000000 -0500
-+++ binutils-2.15.91.0.2/bfd/configure	2004-09-10 07:35:20.000000000 -0500
++++ binutils-2.15.91.0.2/bfd/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -1687,6 +1687,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -183,7 +183,7 @@ diff -urN binutils-2.15.91.0.2-dist/bfd/configure binutils-2.15.91.0.2/bfd/confi
  	;;
 diff -urN binutils-2.15.91.0.2-dist/bfd/configure.in binutils-2.15.91.0.2/bfd/configure.in
 --- binutils-2.15.91.0.2-dist/bfd/configure.in	2004-07-27 23:36:07.000000000 -0500
-+++ binutils-2.15.91.0.2/bfd/configure.in	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/bfd/configure.in	2004-09-28 14:33:13.000000000 -0500
 @@ -164,7 +164,7 @@
    alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
  	COREFILE=''
@@ -222,7 +222,7 @@ diff -urN binutils-2.15.91.0.2-dist/bfd/configure.in binutils-2.15.91.0.2/bfd/co
  	;;
 diff -urN binutils-2.15.91.0.2-dist/binutils/configure binutils-2.15.91.0.2/binutils/configure
 --- binutils-2.15.91.0.2-dist/binutils/configure	2004-04-12 14:56:34.000000000 -0500
-+++ binutils-2.15.91.0.2/binutils/configure	2004-09-10 07:35:31.000000000 -0500
++++ binutils-2.15.91.0.2/binutils/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -1575,6 +1575,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -237,7 +237,7 @@ diff -urN binutils-2.15.91.0.2-dist/binutils/configure binutils-2.15.91.0.2/binu
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
 diff -urN binutils-2.15.91.0.2-dist/configure binutils-2.15.91.0.2/configure
 --- binutils-2.15.91.0.2-dist/configure	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.15.91.0.2/configure	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -1349,6 +1349,18 @@
    i[3456789]86-*-coff | i[3456789]86-*-elf)
      noconfigdirs="$noconfigdirs ${libgcj}"
@@ -259,7 +259,7 @@ diff -urN binutils-2.15.91.0.2-dist/configure binutils-2.15.91.0.2/configure
      # not build java stuff by default.
 diff -urN binutils-2.15.91.0.2-dist/configure.in binutils-2.15.91.0.2/configure.in
 --- binutils-2.15.91.0.2-dist/configure.in	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.15.91.0.2/configure.in	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/configure.in	2004-09-28 14:33:13.000000000 -0500
 @@ -569,6 +569,18 @@
    i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
      noconfigdirs="$noconfigdirs ${libgcj}"
@@ -281,7 +281,7 @@ diff -urN binutils-2.15.91.0.2-dist/configure.in binutils-2.15.91.0.2/configure.
      # not build java stuff by default.
 diff -urN binutils-2.15.91.0.2-dist/gas/configure binutils-2.15.91.0.2/gas/configure
 --- binutils-2.15.91.0.2-dist/gas/configure	2004-07-27 23:36:09.000000000 -0500
-+++ binutils-2.15.91.0.2/gas/configure	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/gas/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -3408,6 +3408,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -372,7 +372,7 @@ diff -urN binutils-2.15.91.0.2-dist/gas/configure binutils-2.15.91.0.2/gas/confi
        sparc-*-elf)			fmt=elf ;;
 diff -urN binutils-2.15.91.0.2-dist/gas/configure.in binutils-2.15.91.0.2/gas/configure.in
 --- binutils-2.15.91.0.2-dist/gas/configure.in	2004-07-27 23:36:09.000000000 -0500
-+++ binutils-2.15.91.0.2/gas/configure.in	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/gas/configure.in	2004-09-28 14:33:13.000000000 -0500
 @@ -195,6 +195,7 @@
        alpha*-*-osf*)			fmt=ecoff ;;
        alpha*-*-linuxecoff*)		fmt=ecoff ;;
@@ -451,7 +451,7 @@ diff -urN binutils-2.15.91.0.2-dist/gas/configure.in binutils-2.15.91.0.2/gas/co
        sparc-*-elf)			fmt=elf ;;
 diff -urN binutils-2.15.91.0.2-dist/gprof/configure binutils-2.15.91.0.2/gprof/configure
 --- binutils-2.15.91.0.2-dist/gprof/configure	2004-07-27 23:36:10.000000000 -0500
-+++ binutils-2.15.91.0.2/gprof/configure	2004-09-10 07:35:31.000000000 -0500
++++ binutils-2.15.91.0.2/gprof/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -3401,6 +3401,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -466,7 +466,7 @@ diff -urN binutils-2.15.91.0.2-dist/gprof/configure binutils-2.15.91.0.2/gprof/c
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
 diff -urN binutils-2.15.91.0.2-dist/ld/configure binutils-2.15.91.0.2/ld/configure
 --- binutils-2.15.91.0.2-dist/ld/configure	2004-07-27 23:36:11.000000000 -0500
-+++ binutils-2.15.91.0.2/ld/configure	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/ld/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -1578,6 +1578,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -481,7 +481,7 @@ diff -urN binutils-2.15.91.0.2-dist/ld/configure binutils-2.15.91.0.2/ld/configu
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
 diff -urN binutils-2.15.91.0.2-dist/ld/configure.tgt binutils-2.15.91.0.2/ld/configure.tgt
 --- binutils-2.15.91.0.2-dist/ld/configure.tgt	2004-07-27 23:36:11.000000000 -0500
-+++ binutils-2.15.91.0.2/ld/configure.tgt	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/ld/configure.tgt	2004-09-28 14:33:13.000000000 -0500
 @@ -31,6 +31,7 @@
  			targ_extra_emuls="criself crislinux"
  			targ_extra_libpath=$targ_extra_emuls ;;
@@ -624,9 +624,39 @@ diff -urN binutils-2.15.91.0.2-dist/ld/configure.tgt binutils-2.15.91.0.2/ld/con
  alpha*-*-osf*)		targ_emul=alpha ;;
  alpha*-*-gnu*)		targ_emul=elf64alpha ;;
  alpha*-*-netware*)	targ_emul=alpha ;;
+diff -urN binutils-2.15.91.0.2-dist/ld/emultempl/elf32.em binutils-2.15.91.0.2/ld/emultempl/elf32.em
+--- binutils-2.15.91.0.2-dist/ld/emultempl/elf32.em	2004-07-27 23:36:11.000000000 -0500
++++ binutils-2.15.91.0.2/ld/emultempl/elf32.em	2004-09-28 14:33:54.000000000 -0500
+@@ -327,7 +327,7 @@
+ 
+ EOF
+ case ${target} in
+-  *-*-linux-gnu*)
++  *-*-linux-gnu* | *-*-linux-uclibc*)
+     cat >>e${EMULATION_NAME}.c <<EOF
+ 	  {
+ 	    struct bfd_link_needed_list *l;
+@@ -500,7 +500,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
+@@ -784,7 +784,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 -urN binutils-2.15.91.0.2-dist/libtool.m4 binutils-2.15.91.0.2/libtool.m4
 --- binutils-2.15.91.0.2-dist/libtool.m4	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.15.91.0.2/libtool.m4	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/libtool.m4	2004-09-28 14:33:13.000000000 -0500
 @@ -645,6 +645,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;
@@ -641,7 +671,7 @@ diff -urN binutils-2.15.91.0.2-dist/libtool.m4 binutils-2.15.91.0.2/libtool.m4
      [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
 diff -urN binutils-2.15.91.0.2-dist/ltconfig binutils-2.15.91.0.2/ltconfig
 --- binutils-2.15.91.0.2-dist/ltconfig	2004-07-27 23:36:06.000000000 -0500
-+++ binutils-2.15.91.0.2/ltconfig	2004-09-10 07:35:21.000000000 -0500
++++ binutils-2.15.91.0.2/ltconfig	2004-09-28 14:33:13.000000000 -0500
 @@ -603,6 +603,7 @@
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  case $host_os in
@@ -677,7 +707,7 @@ diff -urN binutils-2.15.91.0.2-dist/ltconfig binutils-2.15.91.0.2/ltconfig
    need_version=no
 diff -urN binutils-2.15.91.0.2-dist/opcodes/configure binutils-2.15.91.0.2/opcodes/configure
 --- binutils-2.15.91.0.2-dist/opcodes/configure	2004-07-27 23:36:11.000000000 -0500
-+++ binutils-2.15.91.0.2/opcodes/configure	2004-09-10 07:35:31.000000000 -0500
++++ binutils-2.15.91.0.2/opcodes/configure	2004-09-28 14:33:13.000000000 -0500
 @@ -1690,6 +1690,11 @@
    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    ;;