binutils: Update from 2.21 to 2.21.1a

Due to a GPL violation corrected Binutils archives were uploaded with the suffix »a« and the faulty archives were removed [1]. The URLs redirect to the new archives and therefore the checksums are now incorrect.

Use this incident to update the package also to the new version 2.21.1a. Due to this one patch had to be regenerated and was taken from OE-core [2].

This patch is build tested using `angstrom-2010.x` and `minimal{,-uclibc}` for `MACHINE = "beagleboard"`.

[1] http://nickclifton.livejournal.com/9067.html
[2] http://git.openembedded.org/cgit.cgi/openembedded-core/tree/meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch?id=4810404f22d7cf8849dc32da68dd33a156cac407

Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com>
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>

16 files changed, 261 insertions, 259 deletions

diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index e9f8405002..a5dfb7c565 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -6,7 +6,7 @@
 
 # Base line versions, good for most things
 PREFERRED_GCC_VERSION                ?= "4.5"
-PREFERRED_BINUTILS_VERSION           ?= "2.21"
+PREFERRED_BINUTILS_VERSION           ?= "2.21.1a"
 PREFERRED_UCLIBC_VERSION             ?= "git"
 PREFERRED_EGLIBC_VERSION             ?= "2.12"
 PREFERRED_GLIBC_VERSION              ?= "2.10.1"
diff --git a/recipes/binutils/binutils-2.21/110-arm-eabi-conf.patch b/recipes/binutils/binutils-2.21.1a/110-arm-eabi-conf.patch
index 2623301da0..2623301da0 100644
--- a/recipes/binutils/binutils-2.21/110-arm-eabi-conf.patch
+++ b/recipes/binutils/binutils-2.21.1a/110-arm-eabi-conf.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-2.16.1-e300c2c3.patch b/recipes/binutils/binutils-2.21.1a/binutils-2.16.1-e300c2c3.patch
index c5e4234f22..c5e4234f22 100644
--- a/recipes/binutils/binutils-2.21/binutils-2.16.1-e300c2c3.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-2.16.1-e300c2c3.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/recipes/binutils/binutils-2.21.1a/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
index 8df5b1fea0..8df5b1fea0 100644
--- a/recipes/binutils/binutils-2.21/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch b/recipes/binutils/binutils-2.21.1a/binutils-2.19.1-ld-sysroot.patch
index adcabb4f66..adcabb4f66 100644
--- a/recipes/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-2.19.1-ld-sysroot.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-arm-pr7093.patch b/recipes/binutils/binutils-2.21.1a/binutils-arm-pr7093.patch
index ad4a556e0f..ad4a556e0f 100644
--- a/recipes/binutils/binutils-2.21/binutils-arm-pr7093.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-arm-pr7093.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-100-uclibc-conf.patch
index 8de04e0fe0..8de04e0fe0 100644
--- a/recipes/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-100-uclibc-conf.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-uclibc-300-001_ld_makefile_patch.patch b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-001_ld_makefile_patch.patch
index 04a7e61e25..04a7e61e25 100644
--- a/recipes/binutils/binutils-2.21/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-001_ld_makefile_patch.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-uclibc-300-006_better_file_error.patch b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-006_better_file_error.patch
index f337611edf..f337611edf 100644
--- a/recipes/binutils/binutils-2.21/binutils-uclibc-300-006_better_file_error.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-006_better_file_error.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-uclibc-300-012_check_ldrunpath_length.patch b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-012_check_ldrunpath_length.patch
index b6f5a25ceb..b6f5a25ceb 100644
--- a/recipes/binutils/binutils-2.21/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-300-012_check_ldrunpath_length.patch
diff --git a/recipes/binutils/binutils-2.21/binutils-uclibc-gas-needs-libm.patch b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-gas-needs-libm.patch
index db838cf20c..db838cf20c 100644
--- a/recipes/binutils/binutils-2.21/binutils-uclibc-gas-needs-libm.patch
+++ b/recipes/binutils/binutils-2.21.1a/binutils-uclibc-gas-needs-libm.patch
diff --git a/recipes/binutils/binutils-2.21/fix-clone-conflicts.patch b/recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch
index 5491e261a6..5491e261a6 100644
--- a/recipes/binutils/binutils-2.21/fix-clone-conflicts.patch
+++ b/recipes/binutils/binutils-2.21.1a/fix-clone-conflicts.patch
diff --git a/recipes/binutils/binutils-2.21/libtool-2.4-update.patch b/recipes/binutils/binutils-2.21.1a/libtool-2.4-update.patch
index e6bd4afc1d..a40b06f7a1 100644
--- a/recipes/binutils/binutils-2.21/libtool-2.4-update.patch
+++ b/recipes/binutils/binutils-2.21.1a/libtool-2.4-update.patch
@@ -1,7 +1,7 @@
-Index: binutils-2.21/libtool.m4
+Index: binutils-2.21.1/libtool.m4
 ===================================================================
---- binutils-2.21.orig/libtool.m4
-+++ binutils-2.21/libtool.m4
+--- binutils-2.21.1.orig/libtool.m4
++++ binutils-2.21.1/libtool.m4
 @@ -1,7 +1,8 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  #
@@ -1821,10 +1821,10 @@ Index: binutils-2.21/libtool.m4
 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
 +         [0], [convert $build files to toolchain format])dnl
 +])# _LT_PATH_CONVERSION_FUNCTIONS
-Index: binutils-2.21/ltmain.sh
+Index: binutils-2.21.1/ltmain.sh
 ===================================================================
---- binutils-2.21.orig/ltmain.sh
-+++ binutils-2.21/ltmain.sh
+--- binutils-2.21.1.orig/ltmain.sh
++++ binutils-2.21.1/ltmain.sh
 @@ -1,10 +1,9 @@
 -# Generated from ltmain.m4sh.
  
@@ -6082,7 +6082,7 @@ Index: binutils-2.21/ltmain.sh
  	esac
        done
        deplibs="$new_libs"
-@@ -7101,9 +8032,13 @@ EOF
+@@ -7101,10 +8032,12 @@ EOF
  	  hardcode_libdirs=
  	  dep_rpath=
  	  rpath="$finalize_rpath"
@@ -6090,14 +6090,13 @@ Index: binutils-2.21/ltmain.sh
 +	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
-+		  func_replace_sysroot "$libdir"
-+		  libdir=$func_replace_sysroot_result
-+		  func_stripname '=' '' "$libdir"
-+		  libdir=$func_stripname_result
  	      if test -n "$hardcode_libdir_separator"; then
++		func_replace_sysroot "$libdir"
++		libdir=$func_replace_sysroot_result
  		if test -z "$hardcode_libdirs"; then
  		  hardcode_libdirs="$libdir"
-@@ -7113,18 +8048,18 @@ EOF
+ 		else
+@@ -7113,18 +8046,18 @@ EOF
  		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  		    ;;
  		  *)
@@ -6120,7 +6119,7 @@ Index: binutils-2.21/ltmain.sh
  	      esac
  	    fi
  	  done
-@@ -7133,40 +8068,38 @@ EOF
+@@ -7133,40 +8066,38 @@ EOF
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
  	    if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -6170,7 +6169,7 @@ Index: binutils-2.21/ltmain.sh
  	else
  	  soname="$realname"
  	fi
-@@ -7178,7 +8111,7 @@ EOF
+@@ -7178,7 +8109,7 @@ EOF
  	linknames=
  	for link
  	do
@@ -6179,7 +6178,7 @@ Index: binutils-2.21/ltmain.sh
  	done
  
  	# Use standard objects if they are pic
-@@ -7189,7 +8122,7 @@ EOF
+@@ -7189,7 +8120,7 @@ EOF
  	if test -n "$export_symbols" && test -n "$include_expsyms"; then
  	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
  	  export_symbols="$output_objdir/$libname.uexp"
@@ -6188,7 +6187,7 @@ Index: binutils-2.21/ltmain.sh
  	fi
  
  	orig_export_symbols=
-@@ -7220,13 +8153,45 @@ EOF
+@@ -7220,13 +8151,45 @@ EOF
  	    $opt_dry_run || $RM $export_symbols
  	    cmds=$export_symbols_cmds
  	    save_ifs="$IFS"; IFS='~'
@@ -6239,7 +6238,7 @@ Index: binutils-2.21/ltmain.sh
  		skipped_export=false
  	      else
  		# The command line is too long to execute in one step.
-@@ -7248,7 +8213,7 @@ EOF
+@@ -7248,7 +8211,7 @@ EOF
  	if test -n "$export_symbols" && test -n "$include_expsyms"; then
  	  tmp_export_symbols="$export_symbols"
  	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -6248,7 +6247,7 @@ Index: binutils-2.21/ltmain.sh
  	fi
  
  	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7260,7 +8225,7 @@ EOF
+@@ -7260,7 +8223,7 @@ EOF
  	  # global variables. join(1) would be nice here, but unfortunately
  	  # isn't a blessed tool.
  	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -6257,7 +6256,7 @@ Index: binutils-2.21/ltmain.sh
  	  export_symbols=$output_objdir/$libname.def
  	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  	fi
-@@ -7270,7 +8235,7 @@ EOF
+@@ -7270,7 +8233,7 @@ EOF
  	  case " $convenience " in
  	  *" $test_deplib "*) ;;
  	  *)
@@ -6266,7 +6265,7 @@ Index: binutils-2.21/ltmain.sh
  	    ;;
  	  esac
  	done
-@@ -7286,43 +8251,43 @@ EOF
+@@ -7286,43 +8249,43 @@ EOF
  	  fi
  	  if test -n "$whole_archive_flag_spec"; then
  	    save_libobjs=$libobjs
@@ -6321,7 +6320,7 @@ Index: binutils-2.21/ltmain.sh
  	    cmds=$archive_cmds
  	  fi
  	fi
-@@ -7366,10 +8331,13 @@ EOF
+@@ -7366,10 +8329,13 @@ EOF
  	    echo 'INPUT (' > $output
  	    for obj in $save_libobjs
  	    do
@@ -6337,7 +6336,7 @@ Index: binutils-2.21/ltmain.sh
  	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
  	    output=${output_objdir}/${output_la}.lnk
  	    func_verbose "creating linker input file list: $output"
-@@ -7383,15 +8351,17 @@ EOF
+@@ -7383,15 +8349,17 @@ EOF
  	    fi
  	    for obj
  	    do
@@ -6359,7 +6358,7 @@ Index: binutils-2.21/ltmain.sh
  	      func_len " $test_cmds"
  	      len0=$func_len_result
  	      len=$len0
-@@ -7411,12 +8381,12 @@ EOF
+@@ -7411,12 +8379,12 @@ EOF
  		  if test "$k" -eq 1 ; then
  		    # The first file doesn't have a previous command to add.
  		    reload_objs=$objlist
@@ -6374,7 +6373,7 @@ Index: binutils-2.21/ltmain.sh
  		  fi
  		  last_robj=$output_objdir/$output_la-${k}.$objext
  		  func_arith $k + 1
-@@ -7433,11 +8403,11 @@ EOF
+@@ -7433,11 +8401,11 @@ EOF
  	      # files will link in the last one created.
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  	      reload_objs="$objlist $last_robj"
@@ -6389,7 +6388,7 @@ Index: binutils-2.21/ltmain.sh
  
  	    else
  	      output=
-@@ -7450,9 +8420,9 @@ EOF
+@@ -7450,9 +8418,9 @@ EOF
  	      libobjs=$output
  	      # Append the command to create the export file.
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -6401,7 +6400,7 @@ Index: binutils-2.21/ltmain.sh
  	      fi
  	    fi
  
-@@ -7471,7 +8441,7 @@ EOF
+@@ -7471,7 +8439,7 @@ EOF
  		lt_exit=$?
  
  		# Restore the uninstalled library and exit
@@ -6410,7 +6409,7 @@ Index: binutils-2.21/ltmain.sh
  		  ( cd "$output_objdir" && \
  		    $RM "${realname}T" && \
  		    $MV "${realname}U" "$realname" )
-@@ -7492,7 +8462,7 @@ EOF
+@@ -7492,7 +8460,7 @@ EOF
  	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
  	      tmp_export_symbols="$export_symbols"
  	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -6419,7 +6418,7 @@ Index: binutils-2.21/ltmain.sh
  	    fi
  
  	    if test -n "$orig_export_symbols"; then
-@@ -7504,7 +8474,7 @@ EOF
+@@ -7504,7 +8472,7 @@ EOF
  	      # global variables. join(1) would be nice here, but unfortunately
  	      # isn't a blessed tool.
  	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -6428,7 +6427,7 @@ Index: binutils-2.21/ltmain.sh
  	      export_symbols=$output_objdir/$libname.def
  	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  	    fi
-@@ -7515,7 +8485,7 @@ EOF
+@@ -7515,7 +8483,7 @@ EOF
  	  output=$save_output
  
  	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
@@ -6437,7 +6436,7 @@ Index: binutils-2.21/ltmain.sh
  	    test "X$libobjs" = "X " && libobjs=
  	  fi
  	  # Expand the library linking commands again to reset the
-@@ -7539,23 +8509,23 @@ EOF
+@@ -7539,23 +8507,23 @@ EOF
  
  	if test -n "$delfiles"; then
  	  # Append the command to remove temporary files to $cmds.
@@ -6465,7 +6464,7 @@ Index: binutils-2.21/ltmain.sh
  	  $opt_silent || {
  	    func_quote_for_expand "$cmd"
  	    eval "func_echo $func_quote_for_expand_result"
-@@ -7564,7 +8534,7 @@ EOF
+@@ -7564,7 +8532,7 @@ EOF
  	    lt_exit=$?
  
  	    # Restore the uninstalled library and exit
@@ -6474,7 +6473,7 @@ Index: binutils-2.21/ltmain.sh
  	      ( cd "$output_objdir" && \
  	        $RM "${realname}T" && \
  		$MV "${realname}U" "$realname" )
-@@ -7576,8 +8546,8 @@ EOF
+@@ -7576,8 +8544,8 @@ EOF
  	IFS="$save_ifs"
  
  	# Restore the uninstalled library and exit
@@ -6485,7 +6484,7 @@ Index: binutils-2.21/ltmain.sh
  
  	  if test -n "$convenience"; then
  	    if test -z "$whole_archive_flag_spec"; then
-@@ -7656,17 +8626,20 @@ EOF
+@@ -7656,17 +8624,20 @@ EOF
  
        if test -n "$convenience"; then
  	if test -n "$whole_archive_flag_spec"; then
@@ -6508,7 +6507,7 @@ Index: binutils-2.21/ltmain.sh
        # Create the old-style object.
        reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  
-@@ -7690,7 +8663,7 @@ EOF
+@@ -7690,7 +8661,7 @@ EOF
  	# Create an invalid libtool object if no PIC, so that we don't
  	# accidentally link it into a program.
  	# $show "echo timestamp > $libobj"
@@ -6517,7 +6516,7 @@ Index: binutils-2.21/ltmain.sh
  	exit $EXIT_SUCCESS
        fi
  
-@@ -7740,8 +8713,8 @@ EOF
+@@ -7740,8 +8711,8 @@ EOF
  	if test "$tagname" = CXX ; then
  	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
  	    10.[0123])
@@ -6528,7 +6527,7 @@ Index: binutils-2.21/ltmain.sh
  	    ;;
  	  esac
  	fi
-@@ -7761,7 +8734,7 @@ EOF
+@@ -7761,7 +8732,7 @@ EOF
  	*)
  	  case " $compile_deplibs " in
  	  *" -L$path/$objdir "*)
@@ -6537,7 +6536,7 @@ Index: binutils-2.21/ltmain.sh
  	  esac
  	  ;;
  	esac
-@@ -7771,17 +8744,17 @@ EOF
+@@ -7771,17 +8742,17 @@ EOF
  	-L*)
  	  case " $new_libs " in
  	  *" $deplib "*) ;;
@@ -6559,7 +6558,7 @@ Index: binutils-2.21/ltmain.sh
  
        if test -n "$rpath$xrpath"; then
  	# If the user specified any rpath flags, then add them.
-@@ -7789,7 +8762,7 @@ EOF
+@@ -7789,7 +8760,7 @@ EOF
  	  # This is the magic to use -rpath.
  	  case "$finalize_rpath " in
  	  *" $libdir "*) ;;
@@ -6568,18 +6567,7 @@ Index: binutils-2.21/ltmain.sh
  	  esac
  	done
        fi
-@@ -7799,6 +8772,10 @@ EOF
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
- 	if test -n "$hardcode_libdir_flag_spec"; then
-+	  func_replace_sysroot "$libdir"
-+	  libdir=$func_replace_sysroot_result
-+	  func_stripname '=' '' "$libdir"
-+	  libdir=$func_stripname_result
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs="$libdir"
-@@ -7808,18 +8785,18 @@ EOF
+@@ -7808,18 +8779,18 @@ EOF
  	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  		;;
  	      *)
@@ -6602,7 +6590,7 @@ Index: binutils-2.21/ltmain.sh
  	  esac
  	fi
  	case $host in
-@@ -7828,12 +8805,12 @@ EOF
+@@ -7828,12 +8799,12 @@ EOF
  	  case :$dllsearchpath: in
  	  *":$libdir:"*) ;;
  	  ::) dllsearchpath=$libdir;;
@@ -6617,7 +6605,7 @@ Index: binutils-2.21/ltmain.sh
  	  esac
  	  ;;
  	esac
-@@ -7842,7 +8819,7 @@ EOF
+@@ -7842,7 +8813,7 @@ EOF
        if test -n "$hardcode_libdir_separator" &&
  	 test -n "$hardcode_libdirs"; then
  	libdir="$hardcode_libdirs"
@@ -6626,7 +6614,7 @@ Index: binutils-2.21/ltmain.sh
        fi
        compile_rpath="$rpath"
  
-@@ -7859,18 +8836,18 @@ EOF
+@@ -7859,18 +8830,18 @@ EOF
  	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  		;;
  	      *)
@@ -6649,7 +6637,7 @@ Index: binutils-2.21/ltmain.sh
  	  esac
  	fi
        done
-@@ -7878,7 +8855,7 @@ EOF
+@@ -7878,7 +8849,7 @@ EOF
        if test -n "$hardcode_libdir_separator" &&
  	 test -n "$hardcode_libdirs"; then
  	libdir="$hardcode_libdirs"
@@ -6658,7 +6646,7 @@ Index: binutils-2.21/ltmain.sh
        fi
        finalize_rpath="$rpath"
  
-@@ -7921,6 +8898,12 @@ EOF
+@@ -7921,6 +8892,12 @@ EOF
  	exit_status=0
  	func_show_eval "$link_command" 'exit_status=$?'
  
@@ -6671,7 +6659,7 @@ Index: binutils-2.21/ltmain.sh
  	# Delete the generated files.
  	if test -f "$output_objdir/${outputname}S.${objext}"; then
  	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7943,7 +8926,7 @@ EOF
+@@ -7943,7 +8920,7 @@ EOF
  	  # We should set the runpath_var.
  	  rpath=
  	  for dir in $perm_rpath; do
@@ -6680,7 +6668,7 @@ Index: binutils-2.21/ltmain.sh
  	  done
  	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
  	fi
-@@ -7951,7 +8934,7 @@ EOF
+@@ -7951,7 +8928,7 @@ EOF
  	  # We should set the runpath_var.
  	  rpath=
  	  for dir in $finalize_perm_rpath; do
@@ -6689,7 +6677,7 @@ Index: binutils-2.21/ltmain.sh
  	  done
  	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
  	fi
-@@ -7966,6 +8949,13 @@ EOF
+@@ -7966,6 +8943,13 @@ EOF
  	$opt_dry_run || $RM $output
  	# Link the executable and exit
  	func_show_eval "$link_command" 'exit $?'
@@ -6703,7 +6691,7 @@ Index: binutils-2.21/ltmain.sh
  	exit $EXIT_SUCCESS
        fi
  
-@@ -7999,6 +8989,12 @@ EOF
+@@ -7999,6 +8983,12 @@ EOF
  
        func_show_eval "$link_command" 'exit $?'
  
@@ -6716,7 +6704,7 @@ Index: binutils-2.21/ltmain.sh
        # Now create the wrapper script.
        func_verbose "creating $output"
  
-@@ -8096,7 +9092,7 @@ EOF
+@@ -8096,7 +9086,7 @@ EOF
  	else
  	  oldobjs="$old_deplibs $non_pic_objects"
  	  if test "$preload" = yes && test -f "$symfileobj"; then
@@ -6725,7 +6713,7 @@ Index: binutils-2.21/ltmain.sh
  	  fi
  	fi
  	addlibs="$old_convenience"
-@@ -8104,10 +9100,10 @@ EOF
+@@ -8104,10 +9094,10 @@ EOF
  
        if test -n "$addlibs"; then
  	gentop="$output_objdir/${outputname}x"
@@ -6738,7 +6726,7 @@ Index: binutils-2.21/ltmain.sh
        fi
  
        # Do each command in the archive commands.
-@@ -8118,10 +9114,10 @@ EOF
+@@ -8118,10 +9108,10 @@ EOF
  	# Add any objects from preloaded convenience libraries
  	if test -n "$dlprefiles"; then
  	  gentop="$output_objdir/${outputname}x"
@@ -6751,7 +6739,7 @@ Index: binutils-2.21/ltmain.sh
  	fi
  
  	# POSIX demands no paths to be encoded in archives.  We have
-@@ -8139,7 +9135,7 @@ EOF
+@@ -8139,7 +9129,7 @@ EOF
  	else
  	  echo "copying selected object files to avoid basename conflicts..."
  	  gentop="$output_objdir/${outputname}x"
@@ -6760,7 +6748,7 @@ Index: binutils-2.21/ltmain.sh
  	  func_mkdir_p "$gentop"
  	  save_oldobjs=$oldobjs
  	  oldobjs=
-@@ -8163,18 +9159,28 @@ EOF
+@@ -8163,18 +9153,28 @@ EOF
  		esac
  	      done
  	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -6792,7 +6780,7 @@ Index: binutils-2.21/ltmain.sh
  	else
  	  # the command line is too long to link in one step, link in parts
  	  func_verbose "using piecewise archive linking..."
-@@ -8189,7 +9195,7 @@ EOF
+@@ -8189,7 +9189,7 @@ EOF
  	  do
  	    last_oldobj=$obj
  	  done
@@ -6801,7 +6789,7 @@ Index: binutils-2.21/ltmain.sh
  	  func_len " $test_cmds"
  	  len0=$func_len_result
  	  len=$len0
-@@ -8208,7 +9214,7 @@ EOF
+@@ -8208,7 +9208,7 @@ EOF
  		RANLIB=$save_RANLIB
  	      fi
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -6810,7 +6798,7 @@ Index: binutils-2.21/ltmain.sh
  	      objlist=
  	      len=$len0
  	    fi
-@@ -8216,9 +9222,9 @@ EOF
+@@ -8216,9 +9216,9 @@ EOF
  	  RANLIB=$save_RANLIB
  	  oldobjs=$objlist
  	  if test "X$oldobjs" = "X" ; then
@@ -6822,7 +6810,7 @@ Index: binutils-2.21/ltmain.sh
  	  fi
  	fi
        fi
-@@ -8268,12 +9274,23 @@ EOF
+@@ -8268,12 +9268,23 @@ EOF
  	      *.la)
  		func_basename "$deplib"
  		name="$func_basename_result"
@@ -6849,7 +6837,7 @@ Index: binutils-2.21/ltmain.sh
  	      esac
  	    done
  	    dependency_libs="$newdependency_libs"
-@@ -8284,12 +9301,14 @@ EOF
+@@ -8284,12 +9295,14 @@ EOF
  	      *.la)
  	        func_basename "$lib"
  		name="$func_basename_result"
@@ -6867,7 +6855,7 @@ Index: binutils-2.21/ltmain.sh
  	      esac
  	    done
  	    dlfiles="$newdlfiles"
-@@ -8303,10 +9322,11 @@ EOF
+@@ -8303,10 +9316,11 @@ EOF
  		# the library:
  		func_basename "$lib"
  		name="$func_basename_result"
@@ -6881,7 +6869,7 @@ Index: binutils-2.21/ltmain.sh
  		;;
  	      esac
  	    done
-@@ -8318,7 +9338,7 @@ EOF
+@@ -8318,7 +9332,7 @@ EOF
  		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  		*) abs=`pwd`"/$lib" ;;
  	      esac
@@ -6890,7 +6878,7 @@ Index: binutils-2.21/ltmain.sh
  	    done
  	    dlfiles="$newdlfiles"
  	    newdlprefiles=
-@@ -8327,7 +9347,7 @@ EOF
+@@ -8327,7 +9341,7 @@ EOF
  		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  		*) abs=`pwd`"/$lib" ;;
  	      esac
@@ -6899,7 +6887,7 @@ Index: binutils-2.21/ltmain.sh
  	    done
  	    dlprefiles="$newdlprefiles"
  	  fi
-@@ -8412,7 +9432,7 @@ relink_command=\"$relink_command\""
+@@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
      exit $EXIT_SUCCESS
  }
  
@@ -6908,7 +6896,7 @@ Index: binutils-2.21/ltmain.sh
      func_mode_link ${1+"$@"}
  
  
-@@ -8432,9 +9452,9 @@ func_mode_uninstall ()
+@@ -8432,9 +9446,9 @@ func_mode_uninstall ()
      for arg
      do
        case $arg in
@@ -6921,7 +6909,7 @@ Index: binutils-2.21/ltmain.sh
        esac
      done
  
-@@ -8443,24 +9463,23 @@ func_mode_uninstall ()
+@@ -8443,24 +9457,23 @@ func_mode_uninstall ()
  
      rmdirs=
  
@@ -6953,7 +6941,7 @@ Index: binutils-2.21/ltmain.sh
  	esac
        fi
  
-@@ -8486,18 +9505,17 @@ func_mode_uninstall ()
+@@ -8486,18 +9499,17 @@ func_mode_uninstall ()
  
  	  # Delete the libtool libraries and symlinks.
  	  for n in $library_names; do
@@ -6978,7 +6966,7 @@ Index: binutils-2.21/ltmain.sh
  	    ;;
  	  uninstall)
  	    if test -n "$library_names"; then
-@@ -8525,19 +9543,19 @@ func_mode_uninstall ()
+@@ -8525,19 +9537,19 @@ func_mode_uninstall ()
  	  # Add PIC object to the list of files to remove.
  	  if test -n "$pic_object" &&
  	     test "$pic_object" != none; then
@@ -7001,7 +6989,7 @@ Index: binutils-2.21/ltmain.sh
  	  noexename=$name
  	  case $file in
  	  *.exe)
-@@ -8547,7 +9565,7 @@ func_mode_uninstall ()
+@@ -8547,7 +9559,7 @@ func_mode_uninstall ()
  	    noexename=$func_stripname_result
  	    # $file with .exe has already been added to rmfiles,
  	    # add $file without .exe
@@ -7010,7 +6998,7 @@ Index: binutils-2.21/ltmain.sh
  	    ;;
  	  esac
  	  # Do a test to see if this is a libtool program.
-@@ -8556,7 +9574,7 @@ func_mode_uninstall ()
+@@ -8556,7 +9568,7 @@ func_mode_uninstall ()
  	      func_ltwrapper_scriptname "$file"
  	      relink_command=
  	      func_source $func_ltwrapper_scriptname_result
@@ -7019,7 +7007,7 @@ Index: binutils-2.21/ltmain.sh
  	    else
  	      relink_command=
  	      func_source $dir/$noexename
-@@ -8564,12 +9582,12 @@ func_mode_uninstall ()
+@@ -8564,12 +9576,12 @@ func_mode_uninstall ()
  
  	    # note $name still contains .exe if it was in $file originally
  	    # as does the version of $file that was added into $rmfiles
@@ -7035,7 +7023,7 @@ Index: binutils-2.21/ltmain.sh
  	    fi
  	  fi
  	fi
-@@ -8577,7 +9595,6 @@ func_mode_uninstall ()
+@@ -8577,7 +9589,6 @@ func_mode_uninstall ()
        esac
        func_show_eval "$RM $rmfiles" 'exit_status=1'
      done
@@ -7043,7 +7031,7 @@ Index: binutils-2.21/ltmain.sh
  
      # Try to remove the ${objdir}s in the directories where we deleted files
      for dir in $rmdirs; do
-@@ -8589,16 +9606,16 @@ func_mode_uninstall ()
+@@ -8589,16 +9600,16 @@ func_mode_uninstall ()
      exit $exit_status
  }
  
@@ -7063,10 +7051,10 @@ Index: binutils-2.21/ltmain.sh
  
  if test -n "$exec_cmd"; then
    eval exec "$exec_cmd"
-Index: binutils-2.21/ltoptions.m4
+Index: binutils-2.21.1/ltoptions.m4
 ===================================================================
---- binutils-2.21.orig/ltoptions.m4
-+++ binutils-2.21/ltoptions.m4
+--- binutils-2.21.1.orig/ltoptions.m4
++++ binutils-2.21.1/ltoptions.m4
 @@ -8,7 +8,7 @@
  # unlimited permission to copy and/or distribute it, with or without
  # modifications, as long as this notice is preserved.
@@ -7076,10 +7064,10 @@ Index: binutils-2.21/ltoptions.m4
  
  # This is to help aclocal find these macros, as it can't see m4_define.
  AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-Index: binutils-2.21/ltversion.m4
+Index: binutils-2.21.1/ltversion.m4
 ===================================================================
---- binutils-2.21.orig/ltversion.m4
-+++ binutils-2.21/ltversion.m4
+--- binutils-2.21.1.orig/ltversion.m4
++++ binutils-2.21.1/ltversion.m4
 @@ -7,17 +7,17 @@
  # unlimited permission to copy and/or distribute it, with or without
  # modifications, as long as this notice is preserved.
@@ -7104,10 +7092,10 @@ Index: binutils-2.21/ltversion.m4
  _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
  _LT_DECL(, macro_revision, 0)
  ])
-Index: binutils-2.21/lt~obsolete.m4
+Index: binutils-2.21.1/lt~obsolete.m4
 ===================================================================
---- binutils-2.21.orig/lt~obsolete.m4
-+++ binutils-2.21/lt~obsolete.m4
+--- binutils-2.21.1.orig/lt~obsolete.m4
++++ binutils-2.21.1/lt~obsolete.m4
 @@ -7,7 +7,7 @@
  # unlimited permission to copy and/or distribute it, with or without
  # modifications, as long as this notice is preserved.
@@ -7117,10 +7105,10 @@ Index: binutils-2.21/lt~obsolete.m4
  
  # These exist entirely to fool aclocal when bootstrapping libtool.
  #
-Index: binutils-2.21/configure
+Index: binutils-2.21.1/configure
 ===================================================================
---- binutils-2.21.orig/configure
-+++ binutils-2.21/configure
+--- binutils-2.21.1.orig/configure
++++ binutils-2.21.1/configure
 @@ -2670,7 +2670,7 @@ host_libs="intl mmalloc libiberty opcode
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
@@ -7157,10 +7145,10 @@ Index: binutils-2.21/configure
        :
      else
        MAKEINFO="$MISSING makeinfo"
-Index: binutils-2.21/bfd/configure
+Index: binutils-2.21.1/bfd/configure
 ===================================================================
---- binutils-2.21.orig/bfd/configure
-+++ binutils-2.21/bfd/configure
+--- binutils-2.21.1.orig/bfd/configure
++++ binutils-2.21.1/bfd/configure
 @@ -667,6 +667,9 @@ OTOOL
  LIPO
  NMEDIT
@@ -8490,7 +8478,7 @@ Index: binutils-2.21/bfd/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -14897,7 +15552,7 @@ SHARED_LDFLAGS=
+@@ -15045,7 +15700,7 @@ SHARED_LDFLAGS=
  if test "$enable_shared" = "yes"; then
    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
    if test -n "$x"; then
@@ -8499,7 +8487,7 @@ Index: binutils-2.21/bfd/configure
    fi
  
  # More hacks to build DLLs on Windows.
-@@ -16473,13 +17128,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
+@@ -16619,13 +17274,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -8520,7 +8508,7 @@ Index: binutils-2.21/bfd/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -16494,14 +17156,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
+@@ -16640,14 +17302,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -8539,7 +8527,7 @@ Index: binutils-2.21/bfd/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -16534,12 +17199,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
+@@ -16680,12 +17345,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -8553,7 +8541,7 @@ Index: binutils-2.21/bfd/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -16594,8 +17259,13 @@ reload_flag \
+@@ -16740,8 +17405,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -8567,7 +8555,7 @@ Index: binutils-2.21/bfd/configure
  STRIP \
  RANLIB \
  CC \
-@@ -16605,12 +17275,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -16751,12 +17421,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -8583,7 +8571,7 @@ Index: binutils-2.21/bfd/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -16626,7 +17298,6 @@ no_undefined_flag \
+@@ -16772,7 +17444,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -8591,7 +8579,7 @@ Index: binutils-2.21/bfd/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -16662,6 +17333,7 @@ module_cmds \
+@@ -16808,6 +17479,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -8599,7 +8587,7 @@ Index: binutils-2.21/bfd/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -17441,7 +18113,8 @@ $as_echo X"$file" |
+@@ -17587,7 +18259,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8609,7 +8597,7 @@ Index: binutils-2.21/bfd/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -17544,19 +18217,42 @@ SP2NL=$lt_lt_SP2NL
+@@ -17690,19 +18363,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -8653,7 +8641,7 @@ Index: binutils-2.21/bfd/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -17586,6 +18282,12 @@ global_symbol_to_c_name_address=$lt_lt_c
+@@ -17732,6 +18428,12 @@ global_symbol_to_c_name_address=$lt_lt_c
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -8666,7 +8654,7 @@ Index: binutils-2.21/bfd/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -17595,6 +18297,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -17741,6 +18443,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -8676,7 +8664,7 @@ Index: binutils-2.21/bfd/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -17709,12 +18414,12 @@ with_gcc=$GCC
+@@ -17855,12 +18560,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -8692,7 +8680,7 @@ Index: binutils-2.21/bfd/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -17801,9 +18506,6 @@ inherit_rpath=$inherit_rpath
+@@ -17947,9 +18652,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -8702,7 +8690,7 @@ Index: binutils-2.21/bfd/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -17819,6 +18521,9 @@ include_expsyms=$lt_include_expsyms
+@@ -17965,6 +18667,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -8712,7 +8700,7 @@ Index: binutils-2.21/bfd/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -17851,210 +18556,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -17997,210 +18702,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -9083,10 +9071,10 @@ Index: binutils-2.21/bfd/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/opcodes/configure
+Index: binutils-2.21.1/opcodes/configure
 ===================================================================
---- binutils-2.21.orig/opcodes/configure
-+++ binutils-2.21/opcodes/configure
+--- binutils-2.21.1.orig/opcodes/configure
++++ binutils-2.21.1/opcodes/configure
 @@ -647,6 +647,9 @@ OTOOL
  LIPO
  NMEDIT
@@ -11012,10 +11000,10 @@ Index: binutils-2.21/opcodes/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/binutils/configure
+Index: binutils-2.21.1/binutils/configure
 ===================================================================
---- binutils-2.21.orig/binutils/configure
-+++ binutils-2.21/binutils/configure
+--- binutils-2.21.1.orig/binutils/configure
++++ binutils-2.21.1/binutils/configure
 @@ -654,8 +654,11 @@ OTOOL
  LIPO
  NMEDIT
@@ -12350,7 +12338,7 @@ Index: binutils-2.21/binutils/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -14751,13 +15406,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
+@@ -14754,13 +15409,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -12371,7 +12359,7 @@ Index: binutils-2.21/binutils/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -14772,14 +15434,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
+@@ -14775,14 +15437,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -12390,7 +12378,7 @@ Index: binutils-2.21/binutils/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -14812,12 +15477,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
+@@ -14815,12 +15480,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -12404,7 +12392,7 @@ Index: binutils-2.21/binutils/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -14872,8 +15537,13 @@ reload_flag \
+@@ -14875,8 +15540,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -12418,7 +12406,7 @@ Index: binutils-2.21/binutils/configure
  STRIP \
  RANLIB \
  CC \
-@@ -14883,12 +15553,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -14886,12 +15556,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12434,7 +12422,7 @@ Index: binutils-2.21/binutils/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -14904,7 +15576,6 @@ no_undefined_flag \
+@@ -14907,7 +15579,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -12442,7 +12430,7 @@ Index: binutils-2.21/binutils/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -14940,6 +15611,7 @@ module_cmds \
+@@ -14943,6 +15614,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -12450,7 +12438,7 @@ Index: binutils-2.21/binutils/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -15697,7 +16369,8 @@ $as_echo X"$file" |
+@@ -15700,7 +16372,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12460,7 +12448,7 @@ Index: binutils-2.21/binutils/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -15800,19 +16473,42 @@ SP2NL=$lt_lt_SP2NL
+@@ -15803,19 +16476,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -12504,7 +12492,7 @@ Index: binutils-2.21/binutils/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -15842,6 +16538,12 @@ global_symbol_to_c_name_address=$lt_lt_c
+@@ -15845,6 +16541,12 @@ global_symbol_to_c_name_address=$lt_lt_c
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -12517,7 +12505,7 @@ Index: binutils-2.21/binutils/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -15851,6 +16553,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -15854,6 +16556,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -12527,7 +12515,7 @@ Index: binutils-2.21/binutils/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -15965,12 +16670,12 @@ with_gcc=$GCC
+@@ -15968,12 +16673,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -12543,7 +12531,7 @@ Index: binutils-2.21/binutils/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -16057,9 +16762,6 @@ inherit_rpath=$inherit_rpath
+@@ -16060,9 +16765,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -12553,7 +12541,7 @@ Index: binutils-2.21/binutils/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -16075,6 +16777,9 @@ include_expsyms=$lt_include_expsyms
+@@ -16078,6 +16780,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -12563,7 +12551,7 @@ Index: binutils-2.21/binutils/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -16107,210 +16812,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -16110,210 +16815,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -12934,10 +12922,10 @@ Index: binutils-2.21/binutils/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/gas/configure
+Index: binutils-2.21.1/gas/configure
 ===================================================================
---- binutils-2.21.orig/gas/configure
-+++ binutils-2.21/gas/configure
+--- binutils-2.21.1.orig/gas/configure
++++ binutils-2.21.1/gas/configure
 @@ -645,8 +645,11 @@ OTOOL
  LIPO
  NMEDIT
@@ -14853,10 +14841,10 @@ Index: binutils-2.21/gas/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/gprof/configure
+Index: binutils-2.21.1/gprof/configure
 ===================================================================
---- binutils-2.21.orig/gprof/configure
-+++ binutils-2.21/gprof/configure
+--- binutils-2.21.1.orig/gprof/configure
++++ binutils-2.21.1/gprof/configure
 @@ -629,8 +629,11 @@ OTOOL
  LIPO
  NMEDIT
@@ -16784,11 +16772,11 @@ Index: binutils-2.21/gprof/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/ld/configure
+Index: binutils-2.21.1/ld/configure
 ===================================================================
---- binutils-2.21.orig/ld/configure
-+++ binutils-2.21/ld/configure
-@@ -643,8 +643,11 @@ OTOOL
+--- binutils-2.21.1.orig/ld/configure
++++ binutils-2.21.1/ld/configure
+@@ -644,8 +644,11 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -16800,7 +16788,7 @@ Index: binutils-2.21/ld/configure
  OBJDUMP
  LN_S
  NM
-@@ -776,6 +779,7 @@ enable_static
+@@ -783,6 +786,7 @@ enable_static
  with_pic
  enable_fast_install
  with_gnu_ld
@@ -16808,7 +16796,7 @@ Index: binutils-2.21/ld/configure
  enable_libtool_lock
  enable_nls
  '
-@@ -1436,6 +1440,8 @@ Optional Packages:
+@@ -1447,6 +1451,8 @@ Optional Packages:
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
@@ -16817,7 +16805,7 @@ Index: binutils-2.21/ld/configure
  
  Some influential environment variables:
    CC          C compiler command
-@@ -5562,8 +5568,8 @@ esac
+@@ -6081,8 +6087,8 @@ esac
  
  
  
@@ -16828,7 +16816,7 @@ Index: binutils-2.21/ld/configure
  
  
  
-@@ -5603,7 +5609,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+@@ -6122,7 +6128,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  $as_echo_n "checking how to print strings... " >&6; }
  # Test print first, because it will be a builtin if present.
@@ -16837,7 +16825,7 @@ Index: binutils-2.21/ld/configure
     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
    ECHO='print -r --'
  elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-@@ -6289,8 +6295,8 @@ $as_echo_n "checking whether the shell u
+@@ -6808,8 +6814,8 @@ $as_echo_n "checking whether the shell u
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -16848,7 +16836,7 @@ Index: binutils-2.21/ld/configure
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -6339,6 +6345,80 @@ esac
+@@ -6858,6 +6864,80 @@ esac
  
  
  
@@ -16929,7 +16917,7 @@ Index: binutils-2.21/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  $as_echo_n "checking for $LD option to reload object files... " >&6; }
  if test "${lt_cv_ld_reload_flag+set}" = set; then :
-@@ -6355,6 +6435,11 @@ case $reload_flag in
+@@ -6874,6 +6954,11 @@ case $reload_flag in
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -16941,7 +16929,7 @@ Index: binutils-2.21/ld/configure
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6523,7 +6608,8 @@ mingw* | pw32*)
+@@ -7042,7 +7127,8 @@ mingw* | pw32*)
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -16951,7 +16939,7 @@ Index: binutils-2.21/ld/configure
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -6677,6 +6763,21 @@ esac
+@@ -7196,6 +7282,21 @@ esac
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -16973,7 +16961,7 @@ Index: binutils-2.21/ld/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6692,9 +6793,162 @@ test -z "$deplibs_check_method" && depli
+@@ -7211,9 +7312,162 @@ test -z "$deplibs_check_method" && depli
  
  
  
@@ -16987,7 +16975,9 @@ Index: binutils-2.21/ld/configure
 +
 +
 +
-+if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -17128,9 +17118,7 @@ Index: binutils-2.21/ld/configure
 +
 +
 +
- if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
++if test -n "$ac_tool_prefix"; then
 +  for ac_prog in ar
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -17138,7 +17126,7 @@ Index: binutils-2.21/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_AR+set}" = set; then :
-@@ -6710,7 +6964,7 @@ do
+@@ -7229,7 +7483,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17147,7 +17135,7 @@ Index: binutils-2.21/ld/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6730,11 +6984,15 @@ $as_echo "no" >&6; }
+@@ -7249,11 +7503,15 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -17166,7 +17154,7 @@ Index: binutils-2.21/ld/configure
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-@@ -6750,7 +7008,7 @@ do
+@@ -7269,7 +7527,7 @@ do
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -17175,7 +17163,7 @@ Index: binutils-2.21/ld/configure
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -6769,6 +7027,10 @@ else
+@@ -7288,6 +7546,10 @@ else
  $as_echo "no" >&6; }
  fi
  
@@ -17186,7 +17174,7 @@ Index: binutils-2.21/ld/configure
    if test "x$ac_ct_AR" = x; then
      AR="false"
    else
-@@ -6780,16 +7042,72 @@ ac_tool_warned=yes ;;
+@@ -7299,12 +7561,10 @@ ac_tool_warned=yes ;;
  esac
      AR=$ac_ct_AR
    fi
@@ -17198,17 +17186,13 @@ Index: binutils-2.21/ld/configure
 -test -z "$AR_FLAGS" && AR_FLAGS=cru
 +: ${AR=ar}
 +: ${AR_FLAGS=cru}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ 
+ 
+ 
+@@ -7316,6 +7576,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
+ 
+ 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if test "${lt_cv_ar_at_file+set}" = set; then :
@@ -17221,7 +17205,7 @@ Index: binutils-2.21/ld/configure
 +int
 +main ()
 +{
- 
++
 +  ;
 +  return 0;
 +}
@@ -17247,23 +17231,30 @@ Index: binutils-2.21/ld/configure
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
- 
++
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
- 
++
 +if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
- 
- 
- 
-@@ -7131,8 +7449,8 @@ esac
++
++
++
++
++
++
++
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+@@ -7650,8 +7968,8 @@ esac
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
  # Transform an extracted symbol line into symbol name and symbol address
@@ -17274,7 +17265,7 @@ Index: binutils-2.21/ld/configure
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -7168,6 +7486,7 @@ for ac_symprfx in "" "_"; do
+@@ -7687,6 +8005,7 @@ for ac_symprfx in "" "_"; do
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -17282,7 +17273,7 @@ Index: binutils-2.21/ld/configure
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -7209,6 +7528,18 @@ _LT_EOF
+@@ -7728,6 +8047,18 @@ _LT_EOF
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  	  cat <<_LT_EOF > conftest.$ac_ext
@@ -17301,7 +17292,7 @@ Index: binutils-2.21/ld/configure
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -7220,7 +7551,7 @@ _LT_EOF
+@@ -7739,7 +8070,7 @@ _LT_EOF
  	  cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -17310,7 +17301,7 @@ Index: binutils-2.21/ld/configure
    const char *name;
    void       *address;
  }
-@@ -7246,8 +7577,8 @@ static const void *lt_preloaded_setup() 
+@@ -7765,8 +8096,8 @@ static const void *lt_preloaded_setup() 
  _LT_EOF
  	  # Now try linking the two files.
  	  mv conftest.$ac_objext conftstm.$ac_objext
@@ -17321,7 +17312,7 @@ Index: binutils-2.21/ld/configure
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -7257,8 +7588,8 @@ _LT_EOF
+@@ -7776,8 +8107,8 @@ _LT_EOF
    test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
@@ -17332,7 +17323,7 @@ Index: binutils-2.21/ld/configure
  	else
  	  echo "cannot find nm_test_func in $nlist" >&5
  	fi
-@@ -7295,6 +7626,19 @@ else
+@@ -7814,6 +8145,21 @@ else
  $as_echo "ok" >&6; }
  fi
  
@@ -17349,10 +17340,12 @@ Index: binutils-2.21/ld/configure
 +
 +
 +
++
++
  
  
  
-@@ -7315,6 +7659,42 @@ fi
+@@ -7832,6 +8178,40 @@ fi
  
  
  
@@ -17390,15 +17383,21 @@ Index: binutils-2.21/ld/configure
 +$as_echo "${lt_sysroot:-no}" >&6; }
 +
 +
-+
-+
  
- # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then :
-@@ -7509,6 +7889,123 @@ esac
  
- need_locks="$enable_libtool_lock"
  
+@@ -8022,11 +8402,128 @@ sparc*-*solaris*)
+       ;;
+     esac
+   fi
+-  rm -rf conftest*
+-  ;;
++  rm -rf conftest*
++  ;;
++esac
++
++need_locks="$enable_libtool_lock"
++
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}mt; ac_word=$2
@@ -17484,7 +17483,7 @@ Index: binutils-2.21/ld/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
-+esac
+ esac
 +    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
 +  fi
 +else
@@ -17514,12 +17513,12 @@ Index: binutils-2.21/ld/configure
 +
 +
 +
-+
-+
+ 
+-need_locks="$enable_libtool_lock"
+ 
  
    case $host_os in
-     rhapsody* | darwin*)
-@@ -8072,6 +8569,8 @@ _LT_EOF
+@@ -8591,6 +9088,8 @@ _LT_EOF
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
        echo "$AR cru libconftest.a conftest.o" >&5
        $AR cru libconftest.a conftest.o 2>&5
@@ -17528,7 +17527,7 @@ Index: binutils-2.21/ld/configure
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -8267,7 +8766,8 @@ fi
+@@ -8787,7 +9286,8 @@ fi
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -17538,7 +17537,7 @@ Index: binutils-2.21/ld/configure
  
  
  
-@@ -8356,7 +8856,7 @@ aix3*)
+@@ -8876,7 +9376,7 @@ aix3*)
  esac
  
  # Global variables:
@@ -17547,7 +17546,7 @@ Index: binutils-2.21/ld/configure
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -8654,8 +9154,6 @@ fi
+@@ -9174,8 +9674,6 @@ fi
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -17556,7 +17555,7 @@ Index: binutils-2.21/ld/configure
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -8820,6 +9318,12 @@ $as_echo_n "checking for $compiler optio
+@@ -9340,6 +9838,12 @@ $as_echo_n "checking for $compiler optio
  	lt_prog_compiler_pic='--shared'
  	lt_prog_compiler_static='--static'
  	;;
@@ -17569,7 +17568,7 @@ Index: binutils-2.21/ld/configure
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
  	# which looks to be a dead project)
-@@ -8882,7 +9386,7 @@ $as_echo_n "checking for $compiler optio
+@@ -9402,7 +9906,7 @@ $as_echo_n "checking for $compiler optio
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -17578,7 +17577,7 @@ Index: binutils-2.21/ld/configure
  	lt_prog_compiler_wl='-Qoption ld ';;
        *)
  	lt_prog_compiler_wl='-Wl,';;
-@@ -8939,13 +9443,17 @@ case $host_os in
+@@ -9459,13 +9963,17 @@ case $host_os in
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -17602,7 +17601,7 @@ Index: binutils-2.21/ld/configure
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -9006,6 +9514,11 @@ fi
+@@ -9526,6 +10034,11 @@ fi
  
  
  
@@ -17614,7 +17613,7 @@ Index: binutils-2.21/ld/configure
  #
  # Check to make sure the static flag actually works.
  #
-@@ -9356,7 +9869,8 @@ _LT_EOF
+@@ -9876,7 +10389,8 @@ _LT_EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -17624,7 +17623,7 @@ Index: binutils-2.21/ld/configure
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9404,7 +9918,7 @@ _LT_EOF
+@@ -9924,7 +10438,7 @@ _LT_EOF
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
  	 && test "$tmp_diet" = no
        then
@@ -17633,7 +17632,7 @@ Index: binutils-2.21/ld/configure
  	tmp_sharedflag='-shared'
  	case $cc_basename,$host_cpu in
          pgcc*)				# Portland Group C compiler
-@@ -9455,12 +9969,12 @@ _LT_EOF
+@@ -9975,12 +10489,12 @@ _LT_EOF
  	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  	  hardcode_libdir_flag_spec=
  	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
@@ -17648,7 +17647,7 @@ Index: binutils-2.21/ld/configure
  	  fi
  	  ;;
  	esac
-@@ -9474,8 +9988,8 @@ _LT_EOF
+@@ -9994,8 +10508,8 @@ _LT_EOF
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
@@ -17659,7 +17658,7 @@ Index: binutils-2.21/ld/configure
        fi
        ;;
  
-@@ -9493,8 +10007,8 @@ _LT_EOF
+@@ -10013,8 +10527,8 @@ _LT_EOF
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17670,7 +17669,7 @@ Index: binutils-2.21/ld/configure
        else
  	ld_shlibs=no
        fi
-@@ -9540,8 +10054,8 @@ _LT_EOF
+@@ -10060,8 +10574,8 @@ _LT_EOF
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -17681,7 +17680,7 @@ Index: binutils-2.21/ld/configure
        else
  	ld_shlibs=no
        fi
-@@ -9671,7 +10185,13 @@ _LT_EOF
+@@ -10191,7 +10705,13 @@ _LT_EOF
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -17696,7 +17695,7 @@ Index: binutils-2.21/ld/configure
  /* end confdefs.h.  */
  
  int
-@@ -9684,22 +10204,29 @@ main ()
+@@ -10204,22 +10724,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -17739,7 +17738,7 @@ Index: binutils-2.21/ld/configure
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
          archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-@@ -9711,7 +10238,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10231,7 +10758,13 @@ if test -z "$aix_libpath"; then aix_libp
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -17754,7 +17753,7 @@ Index: binutils-2.21/ld/configure
  /* end confdefs.h.  */
  
  int
-@@ -9724,22 +10257,29 @@ main ()
+@@ -10244,22 +10777,29 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
  
@@ -17797,7 +17796,7 @@ Index: binutils-2.21/ld/configure
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  	  # Warning - without using the other run time loading flags,
-@@ -9784,20 +10324,63 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10304,20 +10844,63 @@ if test -z "$aix_libpath"; then aix_libp
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -17875,7 +17874,7 @@ Index: binutils-2.21/ld/configure
        ;;
  
      darwin* | rhapsody*)
-@@ -9862,7 +10445,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10382,7 +10965,7 @@ if test -z "$aix_libpath"; then aix_libp
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -17884,7 +17883,7 @@ Index: binutils-2.21/ld/configure
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9870,7 +10453,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10390,7 +10973,7 @@ if test -z "$aix_libpath"; then aix_libp
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -17893,7 +17892,7 @@ Index: binutils-2.21/ld/configure
        else
  	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -9886,7 +10469,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10406,7 +10989,7 @@ if test -z "$aix_libpath"; then aix_libp
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -17902,7 +17901,7 @@ Index: binutils-2.21/ld/configure
        else
  	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -9910,10 +10493,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10430,10 +11013,10 @@ if test -z "$aix_libpath"; then aix_libp
  	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	  ;;
  	ia64*)
@@ -17915,7 +17914,7 @@ Index: binutils-2.21/ld/configure
  	  ;;
  	esac
        else
-@@ -9992,23 +10575,36 @@ fi
+@@ -10512,23 +11095,36 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -17960,7 +17959,7 @@ Index: binutils-2.21/ld/configure
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-@@ -10093,7 +10689,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10613,7 +11209,7 @@ rm -f core conftest.err conftest.$ac_obj
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17969,7 +17968,7 @@ Index: binutils-2.21/ld/configure
  	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag=' -expect_unresolved \*'
-@@ -10112,9 +10708,9 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10632,9 +11228,9 @@ rm -f core conftest.err conftest.$ac_obj
        no_undefined_flag=' -z defs'
        if test "$GCC" = yes; then
  	wlarc='${wl}'
@@ -17981,7 +17980,7 @@ Index: binutils-2.21/ld/configure
        else
  	case `$CC -V 2>&1` in
  	*"Compilers 5.0"*)
-@@ -10690,8 +11286,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -11210,8 +11806,9 @@ cygwin* | mingw* | pw32* | cegcc*)
    need_version=no
    need_lib_prefix=no
  
@@ -17993,7 +17992,7 @@ Index: binutils-2.21/ld/configure
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -10724,13 +11321,71 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -11244,13 +11841,71 @@ cygwin* | mingw* | pw32* | cegcc*)
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -18066,7 +18065,7 @@ Index: binutils-2.21/ld/configure
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -10826,7 +11481,7 @@ haiku*)
+@@ -11346,7 +12001,7 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -18075,16 +18074,16 @@ Index: binutils-2.21/ld/configure
    hardcode_into_libs=yes
    ;;
  
-@@ -11622,7 +12277,7 @@ else
+@@ -12142,7 +12797,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11625 "configure"
+-#line 12145 "configure"
 +#line $LINENO "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11666,10 +12321,10 @@ else
+@@ -12186,10 +12841,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18097,16 +18096,16 @@ Index: binutils-2.21/ld/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11728,7 +12383,7 @@ else
+@@ -12248,7 +12903,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11731 "configure"
+-#line 12251 "configure"
 +#line $LINENO "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11772,10 +12427,10 @@ else
+@@ -12292,10 +12947,10 @@ else
  /* When -fvisbility=hidden is used, assume the code has been annotated
     correspondingly for the symbols needed.  */
  #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
@@ -18119,7 +18118,7 @@ Index: binutils-2.21/ld/configure
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -14063,13 +14718,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
+@@ -17606,13 +18261,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_
  lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
@@ -18140,7 +18139,7 @@ Index: binutils-2.21/ld/configure
  STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-@@ -14084,14 +14746,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
+@@ -17627,14 +18289,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l
  lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -18159,7 +18158,7 @@ Index: binutils-2.21/ld/configure
  DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-@@ -14124,12 +14789,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
+@@ -17667,12 +18332,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod
  hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
@@ -18173,7 +18172,7 @@ Index: binutils-2.21/ld/configure
  file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-@@ -14184,8 +14849,13 @@ reload_flag \
+@@ -17782,8 +18447,13 @@ reload_flag \
  OBJDUMP \
  deplibs_check_method \
  file_magic_cmd \
@@ -18187,7 +18186,7 @@ Index: binutils-2.21/ld/configure
  STRIP \
  RANLIB \
  CC \
-@@ -14195,12 +14865,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -17793,12 +18463,14 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -18203,7 +18202,7 @@ Index: binutils-2.21/ld/configure
  DSYMUTIL \
  NMEDIT \
  LIPO \
-@@ -14216,7 +14888,6 @@ no_undefined_flag \
+@@ -17814,7 +18486,6 @@ no_undefined_flag \
  hardcode_libdir_flag_spec \
  hardcode_libdir_flag_spec_ld \
  hardcode_libdir_separator \
@@ -18211,7 +18210,7 @@ Index: binutils-2.21/ld/configure
  exclude_expsyms \
  include_expsyms \
  file_list_spec \
-@@ -14252,6 +14923,7 @@ module_cmds \
+@@ -17883,6 +18554,7 @@ module_cmds \
  module_expsym_cmds \
  export_symbols_cmds \
  prelink_cmds \
@@ -18219,7 +18218,7 @@ Index: binutils-2.21/ld/configure
  postinstall_cmds \
  postuninstall_cmds \
  finish_cmds \
-@@ -15047,7 +15719,8 @@ $as_echo X"$file" |
+@@ -18690,7 +19362,8 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -18229,7 +18228,7 @@ Index: binutils-2.21/ld/configure
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -15150,19 +15823,42 @@ SP2NL=$lt_lt_SP2NL
+@@ -18793,19 +19466,42 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -18273,7 +18272,7 @@ Index: binutils-2.21/ld/configure
  # A symbol stripping program.
  STRIP=$lt_STRIP
  
-@@ -15192,6 +15888,12 @@ global_symbol_to_c_name_address=$lt_lt_c
+@@ -18835,6 +19531,12 @@ global_symbol_to_c_name_address=$lt_lt_c
  # Transform the output of nm in a C name address pair when lib prefix is needed.
  global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  
@@ -18286,7 +18285,7 @@ Index: binutils-2.21/ld/configure
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
-@@ -15201,6 +15903,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -18844,6 +19546,9 @@ MAGIC_CMD=$MAGIC_CMD
  # Must we lock files when doing compilation?
  need_locks=$lt_need_locks
  
@@ -18296,7 +18295,7 @@ Index: binutils-2.21/ld/configure
  # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  DSYMUTIL=$lt_DSYMUTIL
  
-@@ -15315,12 +16020,12 @@ with_gcc=$GCC
+@@ -18958,12 +19663,12 @@ with_gcc=$GCC
  # Compiler flag to turn off builtin functions.
  no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
@@ -18312,7 +18311,7 @@ Index: binutils-2.21/ld/configure
  # Compiler flag to prevent dynamic linking.
  link_static_flag=$lt_lt_prog_compiler_static
  
-@@ -15407,9 +16112,6 @@ inherit_rpath=$inherit_rpath
+@@ -19050,9 +19755,6 @@ inherit_rpath=$inherit_rpath
  # Whether libtool must link a program against all its dependency libraries.
  link_all_deplibs=$link_all_deplibs
  
@@ -18322,7 +18321,7 @@ Index: binutils-2.21/ld/configure
  # Set to "yes" if exported symbols are required.
  always_export_symbols=$always_export_symbols
  
-@@ -15425,6 +16127,9 @@ include_expsyms=$lt_include_expsyms
+@@ -19068,6 +19770,9 @@ include_expsyms=$lt_include_expsyms
  # Commands necessary for linking programs (against libraries) with templates.
  prelink_cmds=$lt_prelink_cmds
  
@@ -18332,7 +18331,7 @@ Index: binutils-2.21/ld/configure
  # Specify filename containing input files.
  file_list_spec=$lt_file_list_spec
  
-@@ -15457,210 +16162,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -19114,210 +19819,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
    # text mode, it properly converts lines to CR/LF.  This bash problem
    # is reportedly fixed, but why not run on old versions too?
@@ -18703,11 +18702,11 @@ Index: binutils-2.21/ld/configure
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  
-Index: binutils-2.21/bfd/configure.in
+Index: binutils-2.21.1/bfd/configure.in
 ===================================================================
---- binutils-2.21.orig/bfd/configure.in
-+++ binutils-2.21/bfd/configure.in
-@@ -532,7 +532,7 @@ changequote(,)dnl
+--- binutils-2.21.1.orig/bfd/configure.in
++++ binutils-2.21.1/bfd/configure.in
+@@ -536,7 +536,7 @@ changequote(,)dnl
    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
  changequote([,])dnl
    if test -n "$x"; then
@@ -18716,10 +18715,10 @@ Index: binutils-2.21/bfd/configure.in
    fi
  
  # More hacks to build DLLs on Windows.
-Index: binutils-2.21/opcodes/configure.in
+Index: binutils-2.21.1/opcodes/configure.in
 ===================================================================
---- binutils-2.21.orig/opcodes/configure.in
-+++ binutils-2.21/opcodes/configure.in
+--- binutils-2.21.1.orig/opcodes/configure.in
++++ binutils-2.21.1/opcodes/configure.in
 @@ -134,7 +134,7 @@ changequote(,)dnl
    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
  changequote([,])dnl
diff --git a/recipes/binutils/binutils-cross-sdk_2.21.bb b/recipes/binutils/binutils-cross-sdk_2.21.1a.bb
index 876af0b0f1..876af0b0f1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.21.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.21.1a.bb
diff --git a/recipes/binutils/binutils-cross_2.21.bb b/recipes/binutils/binutils-cross_2.21.1a.bb
index d47c24dd25..d47c24dd25 100644
--- a/recipes/binutils/binutils-cross_2.21.bb
+++ b/recipes/binutils/binutils-cross_2.21.1a.bb
diff --git a/recipes/binutils/binutils_2.21.bb b/recipes/binutils/binutils_2.21.1a.bb
index df044aa5ca..e91243f970 100644
--- a/recipes/binutils/binutils_2.21.bb
+++ b/recipes/binutils/binutils_2.21.1a.bb
@@ -13,8 +13,11 @@ SRC_URI = "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
      ${@['','file://libtool-2.4-update.patch'][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == 'yes']} \
      file://binutils-2.19.1-ld-sysroot.patch \
      "
-SRC_URI[md5sum] = "c84c5acc9d266f1a7044b51c85a823f5"
-SRC_URI[sha256sum] = "60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7"
+SRC_URI[md5sum] = "bde820eac53fa3a8d8696667418557ad"
+SRC_URI[sha256sum] = "cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654"
+
+# 2.21.1a has a mismatched dir name within the tarball
+S = "${WORKDIR}/binutils-2.21.1"
 
 FILES_${PN}-symlinks += "${bindir}/elfedit"
 # When we enable gold this might need to be make conditional