diff options
| author | Andreas Schwab <schwab@suse.de> | 2007-03-18 11:17:44 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2007-03-18 11:17:44 +0000 |
| commit | f210f1cd67fb6a528e4c8647a41106e11320fc91 (patch) | |
| tree | a0c64b5f975c0c1c7ca96cd80fa2d8dbea2dc072 | |
| parent | f58e97341c3204fb2ab0fc6a03778e5923a9d94c (diff) | |
| download | gcc-f210f1cd67fb6a528e4c8647a41106e11320fc91.zip gcc-f210f1cd67fb6a528e4c8647a41106e11320fc91.tar.gz gcc-f210f1cd67fb6a528e4c8647a41106e11320fc91.tar.bz2 | |
acinclude.m4: Adjust regular expression for ld version extraction.
* acinclude.m4: Adjust regular expression for ld version
extraction.
* configure: Regenerate.
From-SVN: r123035
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/acinclude.m4 | 2 | ||||
| -rwxr-xr-x | libgomp/configure | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index fa0bbcd..782bb4f 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 e8de93d..acf47df 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 68d4c38..5cd8ef5 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 }'` |