Support binutils 2.100 and 3.0.

(cherry picked from commit 0549ce8ec1f66a41c59815e50dd48ffd74fabb52)

diff --git a/ChangeLog b/ChangeLog
index 67793804aebcd4065149b5bba610e0e50ead07ef..5927a241a198e47b603a0cdd887e09dfa8dd93ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.in: Support binutils 2.100 and 3.0.
+
 2009-09-07  Ulrich Drepper  <drepper@redhat.com>
 
        * locale/programs/ld-collate.c (struct locale_collate_t): Add

diff --git a/configure b/configure
index 2796424e35750f9835f0707a577a07519b397fa5..fb5f07cf7ac3ce6e30ee3b24b6043b8a61eb0a1c 100755 (executable)
--- a/configure
+++ b/configure
@@ -4839,7 +4839,7 @@ $as_echo_n "checking version of $AS... " >&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-9].[2-9]*)
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
@@ -4902,7 +4902,7 @@ $as_echo_n "checking version of $LD... " >&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-9].[2-9]*)
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|3-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 1660b2c479419da147b32d03ed1d76272ab3a26b..4bd85015a2e5d1d4f10676733dd92708d5333470 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -897,10 +897,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]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
+                 [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-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]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
+                 [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*]|[3-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