about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2009-09-28 04:18:09 -0700
committerUlrich Drepper <drepper@redhat.com>2009-09-28 04:18:09 -0700
commitf450806e22be467a8d613f9a811508ccb87a5d1a (patch)
treefbf662b173bb8a42a319e69fc26247f2999b68fe
parent4fd894620f22dc189d3f8339e39c630c4d05421b (diff)
downloadglibc-f450806e22be467a8d613f9a811508ccb87a5d1a.tar.gz
glibc-f450806e22be467a8d613f9a811508ccb87a5d1a.tar.xz
glibc-f450806e22be467a8d613f9a811508ccb87a5d1a.zip
Handle future binutils versions correctly.
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index db2c0a1ff9..25093e47c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.in: Exclude binutils 2.X.  Support binutils 2.100
+	and XX.
+
 2009-09-25  Andreas Schwab  <schwab@redhat.com>
 
 	* elf/dl-reloc.c (RESOLVE_MAP): Always pass
diff --git a/configure b/configure
index 40121ced34..ce76653821 100755
--- a/configure
+++ b/configure
@@ -4864,7 +4864,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.1[0-9][0-9]*|2.[2-9]*|[3-9].*)
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
@@ -4927,7 +4927,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.1[0-9][0-9]*|2.[2-9]*|3-9.*)
+    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-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 4a81fb0516..182c683e50 100644
--- a/configure.in
+++ b/configure.in
@@ -915,10 +915,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.1[0-9][0-9]*|2.[2-9]*|[3-9].*], AS=: critic_missing="$critic_missing as")
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-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.1[0-9][0-9]*|2.[2-9]*]|[3-9].*, LD=: critic_missing="$critic_missing ld")
+		  [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-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