binutils: Fix QA staging errors for target binutils

* The spurious paths were caused by a -L on commandline which pointed to
  build dir. So we dont use -L <wordir> -liberty instead use the
  libiberty.a directly on commandline effects are same but .la does not
  have the workdir path in deplibs

Patch obtained from OpenEmbedded, written by Khem Raj.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>

1 files changed, 846 insertions, 802 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch
index 7b4d3903dc..52c4928c8b 100644
--- a/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch
+++ b/meta/recipes-devtools/binutils/binutils-2.21/libtool-2.4-update.patch
@@ -1,7 +1,7 @@
 Index: binutils-2.21/libtool.m4
 ===================================================================
---- binutils-2.21.orig/libtool.m4
-+++ binutils-2.21/libtool.m4
+--- binutils-2.21.orig/libtool.m4	2010-01-09 13:11:31.000000000 -0800
++++ binutils-2.21/libtool.m4	2011-01-07 10:49:16.396101000 -0800
 @@ -1,7 +1,8 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  #
@@ -22,7 +22,7 @@ Index: binutils-2.21/libtool.m4
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
+@@ -37,7 +39,7 @@
  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  ])
  
@@ -31,7 +31,7 @@ Index: binutils-2.21/libtool.m4
  
  
  # LT_PREREQ(VERSION)
-@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
+@@ -92,7 +94,8 @@
  LIBTOOL_DEPS="$ltmain"
  
  # Always use our own libtool.
@@ -41,7 +41,7 @@ Index: binutils-2.21/libtool.m4
  AC_SUBST(LIBTOOL)dnl
  
  _LT_SETUP
-@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable
+@@ -166,10 +169,13 @@
  dnl
  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -55,7 +55,7 @@ Index: binutils-2.21/libtool.m4
  
  _LT_CONFIG_LIBTOOL_INIT([
  # See if we are running on zsh, and set the options which allow our
-@@ -199,7 +205,7 @@ aix3*)
+@@ -199,7 +205,7 @@
  esac
  
  # Global variables:
@@ -64,7 +64,7 @@ Index: binutils-2.21/libtool.m4
  can_build_shared=yes
  
  # All known linkers require a `.a' archive for static linking (except MSVC,
-@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_
+@@ -632,7 +638,7 @@
  m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
  configured by $[0], generated by m4_PACKAGE_STRING.
  
@@ -73,7 +73,7 @@ Index: binutils-2.21/libtool.m4
  This config.lt script is free software; the Free Software Foundation
  gives unlimited permision to copy, distribute and modify it."
  
-@@ -746,15 +752,12 @@ _LT_EOF
+@@ -746,15 +752,12 @@
    # 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?
@@ -93,7 +93,7 @@ Index: binutils-2.21/libtool.m4
      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
    chmod +x "$ofile"
  ],
-@@ -980,6 +983,8 @@ _LT_EOF
+@@ -980,6 +983,8 @@
        $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
        echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
        $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
@@ -102,7 +102,7 @@ Index: binutils-2.21/libtool.m4
        cat > conftest.c << _LT_EOF
  int main() { return 0;}
  _LT_EOF
-@@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1069,30 +1074,41 @@
    fi
  ])
  
@@ -160,7 +160,7 @@ Index: binutils-2.21/libtool.m4
  ])# _LT_SYS_MODULE_PATH_AIX
  
  
-@@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+@@ -1117,7 +1133,7 @@
  
  AC_MSG_CHECKING([how to print strings])
  # Test print first, because it will be a builtin if present.
@@ -169,7 +169,7 @@ Index: binutils-2.21/libtool.m4
     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
-@@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo progr
+@@ -1161,6 +1177,39 @@
  ])# _LT_PROG_ECHO_BACKSLASH
  
  
@@ -209,7 +209,7 @@ Index: binutils-2.21/libtool.m4
  # _LT_ENABLE_LOCK
  # ---------------
  m4_defun([_LT_ENABLE_LOCK],
-@@ -1307,14 +1356,47 @@ need_locks="$enable_libtool_lock"
+@@ -1307,14 +1356,47 @@
  ])# _LT_ENABLE_LOCK
  
  
@@ -262,7 +262,7 @@ Index: binutils-2.21/libtool.m4
  
  AC_CHECK_TOOL(STRIP, strip, :)
  test -z "$STRIP" && STRIP=:
-@@ -1610,7 +1692,7 @@ else
+@@ -1610,7 +1692,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
@@ -271,7 +271,7 @@ Index: binutils-2.21/libtool.m4
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -1654,10 +1736,10 @@ else
+@@ -1654,10 +1736,10 @@
  /* 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))
@@ -284,7 +284,7 @@ Index: binutils-2.21/libtool.m4
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -2197,8 +2279,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2197,8 +2279,9 @@
    need_version=no
    need_lib_prefix=no
  
@@ -296,7 +296,7 @@ Index: binutils-2.21/libtool.m4
      library_names_spec='$libname.dll.a'
      # DLL is installed to $(libdir)/../bin by postinstall_cmds
      postinstall_cmds='base_file=`basename \${file}`~
-@@ -2231,13 +2314,71 @@ m4_if([$1], [],[
+@@ -2231,13 +2314,71 @@
        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
        ;;
      esac
@@ -369,7 +369,7 @@ Index: binutils-2.21/libtool.m4
    # FIXME: first we should search . and the directory the executable is in
    shlibpath_var=PATH
    ;;
-@@ -2333,7 +2474,7 @@ haiku*)
+@@ -2333,7 +2474,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -378,7 +378,7 @@ Index: binutils-2.21/libtool.m4
    hardcode_into_libs=yes
    ;;
  
-@@ -2941,6 +3082,11 @@ case $reload_flag in
+@@ -2941,6 +3082,11 @@
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  case $host_os in
@@ -390,7 +390,7 @@ Index: binutils-2.21/libtool.m4
    darwin*)
      if test "$GCC" = yes; then
        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -3007,7 +3153,8 @@ mingw* | pw32*)
+@@ -3007,7 +3153,8 @@
      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
      lt_cv_file_magic_cmd='func_win32_libid'
    else
@@ -400,7 +400,7 @@ Index: binutils-2.21/libtool.m4
      lt_cv_file_magic_cmd='$OBJDUMP -f'
    fi
    ;;
-@@ -3158,6 +3305,21 @@ tpf*)
+@@ -3158,6 +3305,21 @@
    ;;
  esac
  ])
@@ -422,7 +422,7 @@ Index: binutils-2.21/libtool.m4
  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
-@@ -3165,7 +3327,11 @@ test -z "$deplibs_check_method" && depli
+@@ -3165,7 +3327,11 @@
  _LT_DECL([], [deplibs_check_method], [1],
      [Method to check whether dependent libraries are shared objects])
  _LT_DECL([], [file_magic_cmd], [1],
@@ -435,7 +435,7 @@ Index: binutils-2.21/libtool.m4
  ])# _LT_CHECK_MAGIC_METHOD
  
  
-@@ -3268,6 +3434,67 @@ dnl aclocal-1.4 backwards compatibility:
+@@ -3268,6 +3434,67 @@
  dnl AC_DEFUN([AM_PROG_NM], [])
  dnl AC_DEFUN([AC_PROG_NM], [])
  
@@ -503,7 +503,7 @@ Index: binutils-2.21/libtool.m4
  
  # LT_LIB_M
  # --------
-@@ -3394,8 +3621,8 @@ esac
+@@ -3394,8 +3621,8 @@
  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
@@ -514,7 +514,7 @@ Index: binutils-2.21/libtool.m4
  
  # Handle CRLF in mingw tool chain
  opt_cr=
-@@ -3431,6 +3658,7 @@ for ac_symprfx in "" "_"; do
+@@ -3431,6 +3658,7 @@
    else
      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
    fi
@@ -522,7 +522,7 @@ Index: binutils-2.21/libtool.m4
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -3464,6 +3692,18 @@ _LT_EOF
+@@ -3464,6 +3692,18 @@
        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  	  cat <<_LT_EOF > conftest.$ac_ext
@@ -541,7 +541,7 @@ Index: binutils-2.21/libtool.m4
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -3475,7 +3715,7 @@ _LT_EOF
+@@ -3475,7 +3715,7 @@
  	  cat <<_LT_EOF >> conftest.$ac_ext
  
  /* The mapping between symbol names and symbols.  */
@@ -550,7 +550,7 @@ Index: binutils-2.21/libtool.m4
    const char *name;
    void       *address;
  }
-@@ -3501,15 +3741,15 @@ static const void *lt_preloaded_setup()
+@@ -3501,15 +3741,15 @@
  _LT_EOF
  	  # Now try linking the two files.
  	  mv conftest.$ac_objext conftstm.$ac_objext
@@ -570,7 +570,7 @@ Index: binutils-2.21/libtool.m4
  	else
  	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
  	fi
-@@ -3542,6 +3782,13 @@ else
+@@ -3542,6 +3782,13 @@
    AC_MSG_RESULT(ok)
  fi
  
@@ -584,7 +584,7 @@ Index: binutils-2.21/libtool.m4
  _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
      [Take the output of nm and produce a listing of raw symbols and C names])
  _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3552,6 +3799,8 @@ _LT_DECL([global_symbol_to_c_name_addres
+@@ -3552,6 +3799,8 @@
  _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
      [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
      [Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -593,7 +593,7 @@ Index: binutils-2.21/libtool.m4
  ]) # _LT_CMD_GLOBAL_SYMBOLS
  
  
-@@ -3563,7 +3812,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
+@@ -3563,7 +3812,6 @@
  _LT_TAGVAR(lt_prog_compiler_pic, $1)=
  _LT_TAGVAR(lt_prog_compiler_static, $1)=
  
@@ -601,7 +601,7 @@ Index: binutils-2.21/libtool.m4
  m4_if([$1], [CXX], [
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -3668,6 +3916,12 @@ m4_if([$1], [CXX], [
+@@ -3668,6 +3916,12 @@
  	  ;;
  	esac
  	;;
@@ -614,7 +614,7 @@ Index: binutils-2.21/libtool.m4
        dgux*)
  	case $cc_basename in
  	  ec++*)
-@@ -3820,7 +4074,7 @@ m4_if([$1], [CXX], [
+@@ -3820,7 +4074,7 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -623,7 +623,7 @@ Index: binutils-2.21/libtool.m4
  	    # Sun C++ 4.2, 5.x and Centerline C++
  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4042,6 +4296,12 @@ m4_if([$1], [CXX], [
+@@ -4042,6 +4296,12 @@
  	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
  	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
  	;;
@@ -636,7 +636,7 @@ Index: binutils-2.21/libtool.m4
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          # Portland Group compilers (*not* the Pentium gcc compiler,
  	# which looks to be a dead project)
-@@ -4104,7 +4364,7 @@ m4_if([$1], [CXX], [
+@@ -4104,7 +4364,7 @@
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        case $cc_basename in
@@ -645,7 +645,7 @@ Index: binutils-2.21/libtool.m4
  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
        *)
  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4161,9 +4421,11 @@ case $host_os in
+@@ -4161,9 +4421,11 @@
      _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -660,7 +660,7 @@ Index: binutils-2.21/libtool.m4
  
  #
  # Check to make sure the PIC flag actually works.
-@@ -4182,6 +4444,8 @@ fi
+@@ -4182,6 +4444,8 @@
  _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
  	[Additional compiler flags for building library objects])
  
@@ -669,7 +669,7 @@ Index: binutils-2.21/libtool.m4
  #
  # Check to make sure the static flag actually works.
  #
-@@ -4202,6 +4466,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog
+@@ -4202,6 +4466,7 @@
  m4_defun([_LT_LINKER_SHLIBS],
  [AC_REQUIRE([LT_PATH_LD])dnl
  AC_REQUIRE([LT_PATH_NM])dnl
@@ -677,7 +677,7 @@ Index: binutils-2.21/libtool.m4
  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_DECL_EGREP])dnl
  m4_require([_LT_DECL_SED])dnl
-@@ -4210,6 +4475,7 @@ m4_require([_LT_TAG_COMPILER])dnl
+@@ -4210,6 +4475,7 @@
  AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
  m4_if([$1], [CXX], [
    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -685,7 +685,7 @@ Index: binutils-2.21/libtool.m4
    case $host_os in
    aix[[4-9]]*)
      # If we're using GNU nm, then we don't want the "-C" option.
-@@ -4224,15 +4490,20 @@ m4_if([$1], [CXX], [
+@@ -4224,15 +4490,20 @@
      ;;
    pw32*)
      _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
@@ -711,7 +711,7 @@ Index: binutils-2.21/libtool.m4
  ], [
    runpath_var=
    _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4400,7 +4671,8 @@ _LT_EOF
+@@ -4400,7 +4671,8 @@
        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
        _LT_TAGVAR(always_export_symbols, $1)=no
        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -721,7 +721,7 @@ Index: binutils-2.21/libtool.m4
  
        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -4448,7 +4720,7 @@ _LT_EOF
+@@ -4448,7 +4720,7 @@
        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
  	 && test "$tmp_diet" = no
        then
@@ -730,7 +730,7 @@ Index: binutils-2.21/libtool.m4
  	tmp_sharedflag='-shared'
  	case $cc_basename,$host_cpu in
          pgcc*)				# Portland Group C compiler
-@@ -4499,12 +4771,12 @@ _LT_EOF
+@@ -4499,12 +4771,12 @@
  	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
  	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
  	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
@@ -745,7 +745,7 @@ Index: binutils-2.21/libtool.m4
  	  fi
  	  ;;
  	esac
-@@ -4518,8 +4790,8 @@ _LT_EOF
+@@ -4518,8 +4790,8 @@
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
@@ -756,7 +756,7 @@ Index: binutils-2.21/libtool.m4
        fi
        ;;
  
-@@ -4537,8 +4809,8 @@ _LT_EOF
+@@ -4537,8 +4809,8 @@
  
  _LT_EOF
        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -767,7 +767,7 @@ Index: binutils-2.21/libtool.m4
        else
  	_LT_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -4584,8 +4856,8 @@ _LT_EOF
+@@ -4584,8 +4856,8 @@
  
      *)
        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -778,7 +778,7 @@ Index: binutils-2.21/libtool.m4
        else
  	_LT_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -4715,7 +4987,7 @@ _LT_EOF
+@@ -4715,7 +4987,7 @@
  	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -787,7 +787,7 @@ Index: binutils-2.21/libtool.m4
          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
          _LT_TAGVAR(archive_expsym_cmds, $1)='$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"
        else
-@@ -4726,7 +4998,7 @@ _LT_EOF
+@@ -4726,7 +4998,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -796,7 +796,7 @@ Index: binutils-2.21/libtool.m4
  	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  	  # Warning - without using the other run time loading flags,
  	  # -berok will link without error, but may produce a broken library.
-@@ -4770,20 +5042,63 @@ _LT_EOF
+@@ -4770,20 +5042,63 @@
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -874,7 +874,7 @@ Index: binutils-2.21/libtool.m4
        ;;
  
      darwin* | rhapsody*)
-@@ -4821,7 +5136,7 @@ _LT_EOF
+@@ -4821,7 +5136,7 @@
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
@@ -883,7 +883,7 @@ Index: binutils-2.21/libtool.m4
        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_TAGVAR(hardcode_direct, $1)=yes
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4829,7 +5144,7 @@ _LT_EOF
+@@ -4829,7 +5144,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -892,7 +892,7 @@ Index: binutils-2.21/libtool.m4
        else
  	_LT_TAGVAR(archive_cmds, $1)='$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
-@@ -4845,7 +5160,7 @@ _LT_EOF
+@@ -4845,7 +5160,7 @@
  
      hpux10*)
        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
@@ -901,7 +901,7 @@ Index: binutils-2.21/libtool.m4
        else
  	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -4869,10 +5184,10 @@ _LT_EOF
+@@ -4869,10 +5184,10 @@
  	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	  ;;
  	ia64*)
@@ -914,7 +914,7 @@ Index: binutils-2.21/libtool.m4
  	  ;;
  	esac
        else
-@@ -4919,16 +5234,31 @@ _LT_EOF
+@@ -4919,16 +5234,31 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -953,7 +953,7 @@ Index: binutils-2.21/libtool.m4
        else
  	_LT_TAGVAR(archive_cmds, $1)='$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'
  	_LT_TAGVAR(archive_expsym_cmds, $1)='$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'
-@@ -5013,7 +5343,7 @@ _LT_EOF
+@@ -5013,7 +5343,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -962,7 +962,7 @@ Index: binutils-2.21/libtool.m4
  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -5032,9 +5362,9 @@ _LT_EOF
+@@ -5032,9 +5362,9 @@
        _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
        if test "$GCC" = yes; then
  	wlarc='${wl}'
@@ -974,7 +974,7 @@ Index: binutils-2.21/libtool.m4
        else
  	case `$CC -V 2>&1` in
  	*"Compilers 5.0"*)
-@@ -5306,8 +5636,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
+@@ -5306,8 +5636,6 @@
      to runtime path list])
  _LT_TAGDECL([], [link_all_deplibs], [0],
      [Whether libtool must link a program against all its dependency libraries])
@@ -983,7 +983,7 @@ Index: binutils-2.21/libtool.m4
  _LT_TAGDECL([], [always_export_symbols], [0],
      [Set to "yes" if exported symbols are required])
  _LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5318,6 +5646,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
+@@ -5318,6 +5646,8 @@
      [Symbols that must always be exported])
  _LT_TAGDECL([], [prelink_cmds], [2],
      [Commands necessary for linking programs (against libraries) with templates])
@@ -992,7 +992,7 @@ Index: binutils-2.21/libtool.m4
  _LT_TAGDECL([], [file_list_spec], [1],
      [Specify filename containing input files])
  dnl FIXME: Not yet implemented
-@@ -5419,6 +5749,7 @@ CC="$lt_save_CC"
+@@ -5419,6 +5749,7 @@
  m4_defun([_LT_LANG_CXX_CONFIG],
  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_DECL_EGREP])dnl
@@ -1000,7 +1000,7 @@ Index: binutils-2.21/libtool.m4
  if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
      (test "X$CXX" != "Xg++"))) ; then
-@@ -5480,6 +5811,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5480,6 +5811,7 @@
  
    # Allow CC to be a program name with arguments.
    lt_save_CC=$CC
@@ -1008,7 +1008,7 @@ Index: binutils-2.21/libtool.m4
    lt_save_LD=$LD
    lt_save_GCC=$GCC
    GCC=$GXX
-@@ -5497,6 +5829,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5497,6 +5829,7 @@
    fi
    test -z "${LDCXX+set}" || LD=$LDCXX
    CC=${CXX-"c++"}
@@ -1016,7 +1016,7 @@ Index: binutils-2.21/libtool.m4
    compiler=$CC
    _LT_TAGVAR(compiler, $1)=$CC
    _LT_CC_BASENAME([$compiler])
-@@ -5518,8 +5851,8 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5518,8 +5851,8 @@
        # Check if GNU C++ uses GNU ld as the underlying linker, since the
        # archiving commands below assume that GNU ld is being used.
        if test "$with_gnu_ld" = yes; then
@@ -1027,7 +1027,7 @@ Index: binutils-2.21/libtool.m4
  
          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5660,7 +5993,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5660,7 +5993,7 @@
            _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
            # Determine the default libpath from the value encoded in an empty
            # executable.
@@ -1036,7 +1036,7 @@ Index: binutils-2.21/libtool.m4
            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
            _LT_TAGVAR(archive_expsym_cmds, $1)='$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"
-@@ -5672,7 +6005,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5672,7 +6005,7 @@
            else
  	    # Determine the default libpath from the value encoded in an
  	    # empty executable.
@@ -1045,7 +1045,7 @@ Index: binutils-2.21/libtool.m4
  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  	    # Warning - without using the other run time loading flags,
  	    # -berok will link without error, but may produce a broken library.
-@@ -5714,29 +6047,75 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5714,29 +6047,75 @@
          ;;
  
        cygwin* | mingw* | pw32* | cegcc*)
@@ -1144,7 +1144,7 @@ Index: binutils-2.21/libtool.m4
        darwin* | rhapsody*)
          _LT_DARWIN_LINKER_FEATURES($1)
  	;;
-@@ -5811,7 +6190,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5811,7 +6190,7 @@
              ;;
            *)
              if test "$GXX" = yes; then
@@ -1153,7 +1153,7 @@ Index: binutils-2.21/libtool.m4
              else
                # FIXME: insert proper C++ library support
                _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5882,10 +6261,10 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5882,10 +6261,10 @@
  	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	            ;;
  	          ia64*)
@@ -1166,7 +1166,7 @@ Index: binutils-2.21/libtool.m4
  	            ;;
  	        esac
  	      fi
-@@ -5926,9 +6305,9 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5926,9 +6305,9 @@
            *)
  	    if test "$GXX" = yes; then
  	      if test "$with_gnu_ld" = no; then
@@ -1178,7 +1178,7 @@ Index: binutils-2.21/libtool.m4
  	      fi
  	    fi
  	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5998,20 +6377,20 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5998,20 +6377,20 @@
  	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
@@ -1203,7 +1203,7 @@ Index: binutils-2.21/libtool.m4
  	      ;;
  	    *) # Version 6 and above use weak symbols
  	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-@@ -6206,7 +6585,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6206,7 +6585,7 @@
  	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  		  ;;
  	        *)
@@ -1212,7 +1212,7 @@ Index: binutils-2.21/libtool.m4
  		  ;;
  	      esac
  
-@@ -6252,7 +6631,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6252,7 +6631,7 @@
  
        solaris*)
          case $cc_basename in
@@ -1221,7 +1221,7 @@ Index: binutils-2.21/libtool.m4
  	    # Sun C++ 4.2, 5.x and Centerline C++
              _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
  	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6293,9 +6672,9 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6293,9 +6672,9 @@
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -1233,7 +1233,7 @@ Index: binutils-2.21/libtool.m4
  
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
-@@ -6424,6 +6803,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6424,6 +6803,7 @@
    fi # test -n "$compiler"
  
    CC=$lt_save_CC
@@ -1241,7 +1241,7 @@ Index: binutils-2.21/libtool.m4
    LDCXX=$LD
    LD=$lt_save_LD
    GCC=$lt_save_GCC
-@@ -6438,6 +6818,29 @@ AC_LANG_POP
+@@ -6438,6 +6818,29 @@
  ])# _LT_LANG_CXX_CONFIG
  
  
@@ -1271,7 +1271,7 @@ Index: binutils-2.21/libtool.m4
  # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
  # ---------------------------------
  # Figure out "hidden" library dependencies from verbose
-@@ -6446,6 +6849,7 @@ AC_LANG_POP
+@@ -6446,6 +6849,7 @@
  # objects, libraries and library flags.
  m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -1279,7 +1279,7 @@ Index: binutils-2.21/libtool.m4
  # Dependencies to place before and after the object being linked:
  _LT_TAGVAR(predep_objects, $1)=
  _LT_TAGVAR(postdep_objects, $1)=
-@@ -6496,6 +6900,13 @@ public class foo {
+@@ -6496,6 +6900,13 @@
  };
  _LT_EOF
  ])
@@ -1293,7 +1293,7 @@ Index: binutils-2.21/libtool.m4
  dnl Parse the compiler output and extract the necessary
  dnl objects, libraries and library flags.
  if AC_TRY_EVAL(ac_compile); then
-@@ -6507,7 +6918,7 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6507,7 +6918,7 @@
    pre_test_object_deps_done=no
  
    for p in `eval "$output_verbose_link_cmd"`; do
@@ -1302,7 +1302,7 @@ Index: binutils-2.21/libtool.m4
  
      -L* | -R* | -l*)
         # Some compilers place space between "-{L,R}" and the path.
-@@ -6516,13 +6927,22 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6516,13 +6927,22 @@
            test $p = "-R"; then
  	 prev=$p
  	 continue
@@ -1329,7 +1329,7 @@ Index: binutils-2.21/libtool.m4
  	   # Internal compiler library paths should come after those
  	   # provided the user.  The postdeps already come after the
  	   # user supplied libs so there is no need to process them.
-@@ -6542,8 +6962,10 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6542,8 +6962,10 @@
  	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
  	 fi
         fi
@@ -1340,7 +1340,7 @@ Index: binutils-2.21/libtool.m4
      *.$objext)
         # This assumes that the test object file only shows up
         # once in the compiler output.
-@@ -6579,6 +7001,7 @@ else
+@@ -6579,6 +7001,7 @@
  fi
  
  $RM -f confest.$objext
@@ -1348,7 +1348,7 @@ Index: binutils-2.21/libtool.m4
  
  # PORTME: override above test on systems where it is broken
  m4_if([$1], [CXX],
-@@ -6615,7 +7038,7 @@ linux*)
+@@ -6615,7 +7038,7 @@
  
  solaris*)
    case $cc_basename in
@@ -1357,7 +1357,7 @@ Index: binutils-2.21/libtool.m4
      # The more standards-conforming stlport4 library is
      # incompatible with the Cstd library. Avoid specifying
      # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6728,7 +7151,9 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6728,7 +7151,9 @@
    # Allow CC to be a program name with arguments.
    lt_save_CC="$CC"
    lt_save_GCC=$GCC
@@ -1367,7 +1367,7 @@ Index: binutils-2.21/libtool.m4
    compiler=$CC
    _LT_TAGVAR(compiler, $1)=$CC
    _LT_CC_BASENAME([$compiler])
-@@ -6782,6 +7207,7 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6782,6 +7207,7 @@
  
    GCC=$lt_save_GCC
    CC="$lt_save_CC"
@@ -1375,7 +1375,7 @@ Index: binutils-2.21/libtool.m4
  fi # test "$_lt_disable_F77" != yes
  
  AC_LANG_POP
-@@ -6858,7 +7284,9 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6858,7 +7284,9 @@
    # Allow CC to be a program name with arguments.
    lt_save_CC="$CC"
    lt_save_GCC=$GCC
@@ -1385,7 +1385,7 @@ Index: binutils-2.21/libtool.m4
    compiler=$CC
    GCC=$ac_cv_fc_compiler_gnu
  
-@@ -6914,7 +7342,8 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6914,7 +7342,8 @@
    fi # test -n "$compiler"
  
    GCC=$lt_save_GCC
@@ -1395,7 +1395,7 @@ Index: binutils-2.21/libtool.m4
  fi # test "$_lt_disable_FC" != yes
  
  AC_LANG_POP
-@@ -6951,10 +7380,12 @@ _LT_COMPILER_BOILERPLATE
+@@ -6951,10 +7380,12 @@
  _LT_LINKER_BOILERPLATE
  
  # Allow CC to be a program name with arguments.
@@ -1409,7 +1409,7 @@ Index: binutils-2.21/libtool.m4
  compiler=$CC
  _LT_TAGVAR(compiler, $1)=$CC
  _LT_TAGVAR(LD, $1)="$LD"
-@@ -6985,7 +7416,8 @@ fi
+@@ -6985,7 +7416,8 @@
  AC_LANG_RESTORE
  
  GCC=$lt_save_GCC
@@ -1419,7 +1419,7 @@ Index: binutils-2.21/libtool.m4
  ])# _LT_LANG_GCJ_CONFIG
  
  
-@@ -7020,9 +7452,11 @@ _LT_LINKER_BOILERPLATE
+@@ -7020,9 +7452,11 @@
  
  # Allow CC to be a program name with arguments.
  lt_save_CC="$CC"
@@ -1431,7 +1431,7 @@ Index: binutils-2.21/libtool.m4
  compiler=$CC
  _LT_TAGVAR(compiler, $1)=$CC
  _LT_CC_BASENAME([$compiler])
-@@ -7035,7 +7469,8 @@ fi
+@@ -7035,7 +7469,8 @@
  
  GCC=$lt_save_GCC
  AC_LANG_RESTORE
@@ -1441,7 +1441,7 @@ Index: binutils-2.21/libtool.m4
  ])# _LT_LANG_RC_CONFIG
  
  
-@@ -7094,6 +7529,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object
+@@ -7094,6 +7529,15 @@
  AC_SUBST([OBJDUMP])
  ])
  
@@ -1457,7 +1457,7 @@ Index: binutils-2.21/libtool.m4
  
  # _LT_DECL_SED
  # ------------
-@@ -7187,8 +7631,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
+@@ -7187,8 +7631,8 @@
  # Try some XSI features
  xsi_shell=no
  ( _lt_dummy="a/b/c"
@@ -1468,7 +1468,7 @@ Index: binutils-2.21/libtool.m4
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
-@@ -7227,206 +7671,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
+@@ -7227,206 +7671,162 @@
  ])# _LT_CHECK_SHELL_FEATURES
  
  
@@ -1823,8 +1823,8 @@ Index: binutils-2.21/libtool.m4
 +])# _LT_PATH_CONVERSION_FUNCTIONS
 Index: binutils-2.21/ltmain.sh
 ===================================================================
---- binutils-2.21.orig/ltmain.sh
-+++ binutils-2.21/ltmain.sh
+--- binutils-2.21.orig/ltmain.sh	2010-01-09 13:11:32.000000000 -0800
++++ binutils-2.21/ltmain.sh	2011-01-07 10:49:16.406101000 -0800
 @@ -1,10 +1,9 @@
 -# Generated from ltmain.m4sh.
  
@@ -1870,7 +1870,7 @@ Index: binutils-2.21/ltmain.sh
  
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -106,9 +106,6 @@ _LTECHO_EOF'
+@@ -106,9 +106,6 @@
  }
  
  # NLS nuisances: We save the old values to restore during execute mode.
@@ -1880,7 +1880,7 @@ Index: binutils-2.21/ltmain.sh
  lt_user_locale=
  lt_safe_locale=
  for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -121,15 +118,13 @@ do
+@@ -121,15 +118,13 @@
  	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
  	fi"
  done
@@ -1899,7 +1899,7 @@ Index: binutils-2.21/ltmain.sh
  # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
  # is ksh but when the shell is invoked as "sh" and the current value of
  # the _XPG environment variable is not equal to 1 (one), the special
-@@ -140,7 +135,7 @@ progpath="$0"
+@@ -140,7 +135,7 @@
  
  
  : ${CP="cp -f"}
@@ -1908,7 +1908,7 @@ Index: binutils-2.21/ltmain.sh
  : ${EGREP="/bin/grep -E"}
  : ${FGREP="/bin/grep -F"}
  : ${GREP="/bin/grep"}
-@@ -149,7 +144,7 @@ progpath="$0"
+@@ -149,7 +144,7 @@
  : ${MKDIR="mkdir"}
  : ${MV="mv -f"}
  : ${RM="rm -f"}
@@ -1917,7 +1917,7 @@ Index: binutils-2.21/ltmain.sh
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  : ${Xsed="$SED -e 1s/^X//"}
  
-@@ -169,6 +164,27 @@ IFS=" 	$lt_nl"
+@@ -169,6 +164,27 @@
  dirname="s,/[^/]*$,,"
  basename="s,^.*/,,"
  
@@ -1945,7 +1945,7 @@ Index: binutils-2.21/ltmain.sh
  # func_dirname_and_basename file append nondir_replacement
  # perform func_basename and func_dirname in a single function
  # call:
-@@ -183,17 +199,31 @@ basename="s,^.*/,,"
+@@ -183,17 +199,31 @@
  # those functions but instead duplicate the functionality here.
  func_dirname_and_basename ()
  {
@@ -1987,7 +1987,7 @@ Index: binutils-2.21/ltmain.sh
  
  # These SED scripts presuppose an absolute path with a trailing slash.
  pathcar='s,^/\([^/]*\).*$,\1,'
-@@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+@@ -376,6 +406,15 @@
  # Same as above, but do not quote variable references.
  double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
@@ -2003,7 +2003,7 @@ Index: binutils-2.21/ltmain.sh
  # Re-`\' parameter expansions in output of double_quote_subst that were
  # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
  # in input to double_quote_subst, that '$' was protected from expansion.
-@@ -404,7 +443,7 @@ opt_warning=:
+@@ -404,7 +443,7 @@
  # name if it has been set yet.
  func_echo ()
  {
@@ -2012,7 +2012,7 @@ Index: binutils-2.21/ltmain.sh
  }
  
  # func_verbose arg...
-@@ -430,14 +469,14 @@ func_echo_all ()
+@@ -430,14 +469,14 @@
  # Echo program name prefixed message to standard error.
  func_error ()
  {
@@ -2029,7 +2029,7 @@ Index: binutils-2.21/ltmain.sh
  
      # bash bug again:
      :
-@@ -656,19 +695,35 @@ func_show_eval_locale ()
+@@ -656,19 +695,35 @@
      fi
  }
  
@@ -2068,7 +2068,7 @@ Index: binutils-2.21/ltmain.sh
  	  b more
  	}
  	:go
-@@ -685,7 +740,9 @@ func_version ()
+@@ -685,7 +740,9 @@
  # Echo short help message to standard output and exit.
  func_usage ()
  {
@@ -2079,7 +2079,7 @@ Index: binutils-2.21/ltmain.sh
          s/^# //
  	s/^# *$//
  	s/\$progname/'$progname'/
-@@ -701,7 +758,10 @@ func_usage ()
+@@ -701,7 +758,10 @@
  # unless 'noexit' is passed as argument.
  func_help ()
  {
@@ -2090,7 +2090,7 @@ Index: binutils-2.21/ltmain.sh
          s/^# //
  	s/^# *$//
  	s*\$progname*'$progname'*
-@@ -714,7 +774,11 @@ func_help ()
+@@ -714,7 +774,11 @@
  	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/