This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/gold-vs-libc created. glibc-2.16-ports-merge-876-g9b4859b
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 19 Dec 2012 02:52:18 -0000
- Subject: GNU C Library master sources branch roland/gold-vs-libc created. glibc-2.16-ports-merge-876-g9b4859b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/gold-vs-libc has been created
at 9b4859b0233801c09bd0d8f1e68a1dca9f26f7ad (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9b4859b0233801c09bd0d8f1e68a1dca9f26f7ad
commit 9b4859b0233801c09bd0d8f1e68a1dca9f26f7ad
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Dec 18 18:51:19 2012 -0800
Make ld --version output matching grok gold's output.
diff --git a/ChangeLog b/ChangeLog
index c68d85e..4e98ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-18 Roland McGrath <roland@hack.frob.com>
+
+ * configure.in: Make ld --version output matching grok gold's output.
+ * configure: Regenerated.
+
2012-12-18 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* manual/contrib.texi (Contributors): Spelling correction.
diff --git a/configure b/configure
index 8799b7d..20ce7a6 100755
--- a/configure
+++ b/configure
@@ -4840,7 +4840,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.in b/configure.in
index d369382..28b5ca6 100644
--- a/configure.in
+++ b/configure.in
@@ -925,7 +925,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.
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources