Git cherry-pick of commit 4c14c8c348ee3e9a5fea3608cabcabdb275b6141

2009-09-05  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.in: Support binutils 2.20.
	* configure: regenerate.

diff --git a/ChangeLog b/ChangeLog
index 91942a9e19846109f757b1e83bfbb121f49e8c6f..45eb166d11eba26685a87ea3b550d6138f4aacf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2009-05-09  Ulrich Drepper  <drepper@redhat.com>
+2009-09-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.in: Support binutils 2.20.
+
+2008-06-12  Ulrich Drepper  <drepper@redhat.com>
 
        * Makeconfig: Undo last change.  Add asflags-cpu to ASFLAGS in the
        same place we add ASFLAGS-config.

diff --git a/configure b/configure
index 44e7616f5c7e5a0964e011cc5a87649ac978bcd6..2ab9ebef01da2e6884e2e28d8315e4af341c9ec8 100755 (executable)
--- a/configure
+++ b/configure
@@ -4553,7 +4553,7 @@ echo $ECHO_N "checking version of $AS... $ECHO_C" >&6; }
   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    2.1[3-9]*)
+    2.1[3-9]*|[2-9].[2-9]*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
@@ -4616,7 +4616,7 @@ echo $ECHO_N "checking version of $LD... $ECHO_C" >&6; }
   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    2.1[3-9]*)
+    2.1[3-9]*|[2-9].[2-9]*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 

diff --git a/configure.in b/configure.in
index 63198c99de85d3c26dbffa10dafc89e752a13662..cad7da5a64e81165778e68bd4868b9b8f013c7ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -862,10 +862,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in
 # Accept binutils 2.13 or newer.
 AC_CHECK_PROG_VER(AS, $AS, --version,
                  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
-                 [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
+                 [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
 AC_CHECK_PROG_VER(LD, $LD, --version,
                  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
-                 [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
+                 [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
 
 # We need the physical current working directory.  We cannot use the
 # "pwd -P" shell builtin since that's not portable.  Instead we try to