prune 2.16.90.0.1 / 2.16.90.0.2

diff -ur binutils-2.16.90.0.1.orig/bfd/configure binutils-2.16.90.0.1/bfd/configure

--- binutils-2.16.90.0.1.orig/bfd/configure	2005-04-11 02:19:41.000000000 -0400

+++ binutils-2.16.90.0.1/bfd/configure	2005-04-11 02:19:54.000000000 -0400

@@ -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 -ur binutils-2.16.90.0.1.orig/binutils/configure binutils-2.16.90.0.1/binutils/configure

--- binutils-2.16.90.0.1.orig/binutils/configure	2005-04-11 02:19:42.000000000 -0400

+++ binutils-2.16.90.0.1/binutils/configure	2005-04-11 02:19:54.000000000 -0400

@@ -1555,6 +1555,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.16.90.0.1.orig/gas/configure binutils-2.16.90.0.1/gas/configure

--- binutils-2.16.90.0.1.orig/gas/configure	2005-04-11 02:19:42.000000000 -0400

+++ binutils-2.16.90.0.1/gas/configure	2005-04-11 02:19:54.000000000 -0400

@@ -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 -ur binutils-2.16.90.0.1.orig/gprof/configure binutils-2.16.90.0.1/gprof/configure

--- binutils-2.16.90.0.1.orig/gprof/configure	2005-04-11 02:19:43.000000000 -0400

+++ binutils-2.16.90.0.1/gprof/configure	2005-04-11 02:19:54.000000000 -0400

@@ -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 -ur binutils-2.16.90.0.1.orig/ld/configure binutils-2.16.90.0.1/ld/configure

--- binutils-2.16.90.0.1.orig/ld/configure	2005-04-11 02:19:43.000000000 -0400

+++ binutils-2.16.90.0.1/ld/configure	2005-04-11 02:19:54.000000000 -0400

@@ -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 -ur binutils-2.16.90.0.1.orig/libtool.m4 binutils-2.16.90.0.1/libtool.m4

--- binutils-2.16.90.0.1.orig/libtool.m4	2005-04-11 02:19:42.000000000 -0400

+++ binutils-2.16.90.0.1/libtool.m4	2005-04-11 02:19:54.000000000 -0400

@@ -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.16.90.0.1.orig/ltconfig binutils-2.16.90.0.1/ltconfig

--- binutils-2.16.90.0.1.orig/ltconfig	2005-04-11 02:19:42.000000000 -0400

+++ binutils-2.16.90.0.1/ltconfig	2005-04-11 02:19:54.000000000 -0400

@@ -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.16.90.0.1.orig/opcodes/configure binutils-2.16.90.0.1/opcodes/configure

--- binutils-2.16.90.0.1.orig/opcodes/configure	2005-04-11 02:19:44.000000000 -0400

+++ binutils-2.16.90.0.1/opcodes/configure	2005-04-11 02:19:54.000000000 -0400

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

#!/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@

#!/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)

#!/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,

#! /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

@@ -6594,7 +6594,9 @@

   mips_elf_resolve_final_got_entries (g);

-  if (s->size > MIPS_ELF_GOT_MAX_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)))

     {

       if (! mips_elf_multi_got (output_bfd, info, g, s, local_gotno))

 	return FALSE;