diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-30 00:43:28 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-30 00:43:28 +0000 |
| commit | 8dc528068cd86c1bb452b4db8f1699deaa3c1f09 (patch) | |
| tree | 12dea2c8068e54333cb1a2b8698238283ca1fa79 /libgomp | |
| parent | 20febb30a2e42b4c863bd77d4193fae08ef6fe4e (diff) | |
| download | gcc-8dc528068cd86c1bb452b4db8f1699deaa3c1f09.tar.gz | |
sed and head portability fixes in ld version check.
libstdc++-v3/:
PR libstdc++/38923
* acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Avoid 'head',
use sed script portable to Solaris /bin/sed for extracting ld
version.
* configure: Regenerate.
libgomp/:
* acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head',
use sed script portable to Solaris /bin/sed for extracting ld
version.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152315 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 7 | ||||
| -rw-r--r-- | libgomp/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | libgomp/configure | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3572d1794de..682da80e297 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2009-09-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head', + use sed script portable to Solaris /bin/sed for extracting ld + version. + * configure: Regenerate. + 2009-09-17 Alexander Monakov <amonakov@ispras.ru> * testsuite/libgomp.graphite/bounds.c: New test. diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index ac450ca9b8f..5e0f96c70f5 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -152,8 +152,8 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [ libgomp_ld_is_gold=yes fi changequote(,) - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` 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 6e92fe909c9..d138f687983 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15692,8 +15692,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld libgomp_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` libgomp_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` |