Make ld --version output matching grok gold's output.

diff --git a/ChangeLog b/ChangeLog
index 5bb69dc0b264962dee6d1c0ee8b1e9e97a01e0d6..3254d62a79f901b189b37df447b431be35e8643c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Roland McGrath  <roland@hack.frob.com>
+
+       * configure.in: Make ld --version output matching grok gold's output.
+       * configure: Regenerated.
+
 2014-03-29  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #16770]

diff --git a/configure b/configure
index d4b5edb636312f675acafc0809ac4a4792ff4c27..f157706eafab52d46ce0a126b56a5131d6b6d161 100755 (executable)
--- a/configure
+++ b/configure
@@ -4638,7 +4638,7 @@ else
   # Found it, now check the version.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5
 $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'`
+  ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [go]*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[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)

diff --git a/configure.ac b/configure.ac
index 43bd8a53031b1e4cb6d0fae8ad56282958b9d72c..413f3ca99f0396d8c7dad3c5ac153577546cd6cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -980,7 +980,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version,
                  [GNU assembler.* \([0-9]*\.[0-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.]*\)],
+                 [GNU [go]*ld[^.]* \([0-9][0-9]*\.[0-9.]*\)],
                  [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
 
 # These programs are version sensitive.