aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-12-21 12:58:00 -0800
committerRoland McGrath <roland@hack.frob.com>2014-03-29 13:55:25 -0700
commit312d1c264674f1306a53b7573e5bc55c6eb0a5e5 (patch)
tree4db32f8288c5f648b8c45265827b05ecd49d94a3
parentea6029b19c6004c69a9074bf399091bbfbf58a0c (diff)
downloadtermbaud-roland/gold-vs-libc.tar.gz
termbaud-roland/gold-vs-libc.tar.xz
termbaud-roland/gold-vs-libc.zip
Make ld --version output matching grok gold's output.roland/gold-vs-libc
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bb69dc0b26..3254d62a79f 100644
--- 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 d4b5edb6363..f157706eafa 100755
--- 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 43bd8a53031..413f3ca99f0 100644
--- 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.