This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, roland/gold-vs-libc, created. glibc-2.14-169-ge325a13


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  e325a13d2cc988f765d96296d41acf9700bcb034 (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e325a13d2cc988f765d96296d41acf9700bcb034

commit e325a13d2cc988f765d96296d41acf9700bcb034
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Jun 10 11:04:42 2011 -0700

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

diff --git a/ChangeLog b/ChangeLog
index 4569518..a7740d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -345,6 +345,9 @@
 
 2011-07-16  Roland McGrath  <roland@hack.frob.com>
 
+	* configure.in: Make ld --version output matching grok gold's output.
+	* configure: Regenerated.
+
 	* sysdeps/i386/Makefile: Never use -mpreferred-stack-boundary=2,
 	now disallowed by GCC.
 
diff --git a/configure b/configure
index 2bea3c0..6874607 100755
--- a/configure
+++ b/configure
@@ -4843,7 +4843,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 [Bbinutilsd][^.]* \([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][0-9]*|[3-9].*|[1-9][0-9]*)
diff --git a/configure.in b/configure.in
index 65ace27..488b10f 100644
--- a/configure.in
+++ b/configure.in
@@ -1010,7 +1010,7 @@ 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][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 [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)],
 		  [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

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]