summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorschwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-18 11:17:44 +0000
committerschwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-18 11:17:44 +0000
commit20d905ca4abc7a3d8b5bde20a15e2349609407ab (patch)
treea0c64b5f975c0c1c7ca96cd80fa2d8dbea2dc072 /libgomp
parente817bf15de59e519b89986d27975aecdcafd81f8 (diff)
downloadgcc-20d905ca4abc7a3d8b5bde20a15e2349609407ab.tar.gz
* 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
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog6
-rw-r--r--libgomp/acinclude.m42
-rwxr-xr-xlibgomp/configure2
3 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index fa0bbcd9048..782bb4f467b 100644
--- 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 e8de93db1b1..acf47dfe378 100644
--- 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 68d4c3842cf..5cd8ef564bc 100755
--- 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 }'`