* acinclude.m4: Adjust regular expression for ld version

	extraction.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123035 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index fa0bbcd90484a0ea6b54c35d0b56a07c733e9074..782bb4f467b3a5af980d8f91f487de8b08685665 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-18  Andreas Schwab  <schwab@suse.de>
+
+       * acinclude.m4: Adjust regular expression for ld version
+       extraction.
+       * configure: Regenerate.
+
 2007-03-01  Brooks Moses  <brooks.moses@codesourcery.com>
 
        * Makefile.am: Add install-pdf target as copied from

diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4
index e8de93db1b1c48ad71cf1969dcece1f1468a1155..acf47dfe378eaccb1df416a8acc67dc0126502a6 100644 (file)
--- a/libgomp/acinclude.m4
+++ b/libgomp/acinclude.m4
@@ -148,7 +148,7 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [
   # does some of this, but throws away the result.
   changequote(,)
   ldver=`$LD --version 2>/dev/null | head -1 | \
-         sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+         sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
   changequote([,])
   libgomp_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'`

diff --git a/libgomp/configure b/libgomp/configure
index 68d4c3842cf595079470033d933833722a336c7f..5cd8ef564bc49a9a8e70b58fd70c3ccba5df7aa7 100755 (executable)
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -9438,7 +9438,7 @@ _ACEOF
   # does some of this, but throws away the result.
 
   ldver=`$LD --version 2>/dev/null | head -1 | \
-         sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+         sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
 
   libgomp_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`