diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-26 20:28:24 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-26 20:28:24 +0000 |
| commit | 8b501d3673e09b8e79f3492d13f417b2fba1daa6 (patch) | |
| tree | 7d8bc36932bb0e2dc79fbce175498de517984aa9 /libgomp | |
| parent | 17d1c688288ddf654b4d9f6c18e491b5ba4155c5 (diff) | |
| download | gcc-8b501d3673e09b8e79f3492d13f417b2fba1daa6.tar.gz | |
PR libstdc++/38923
* acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Avoid using too many
*s. Accept ld version without text in ()s.
* configure: Regenerated.
* acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid using too many
*s. Accept ld version without text in ()s.
* configure: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153570 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -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 ac9bb19b55a..f9d20206d23 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2009-10-26 Jakub Jelinek <jakub@redhat.com> + + * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid using too many + *s. Accept ld version without text in ()s. + * configure: Regenerated. + 2009-10-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR libgomp/41418 diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index 5e0f96c70f5..9e6b77b247a 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -153,7 +153,7 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [ fi changequote(,) 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'` + sed -e 's/GNU gold /GNU ld /;s/GNU ld version /GNU ld /;s/GNU ld ([^)]*) /GNU ld /;s/GNU ld \([0-9.][0-9.]*\).*/\1/; 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 a0a93d6d328..dac0399f7b6 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15698,7 +15698,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld fi 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'` + sed -e 's/GNU gold /GNU ld /;s/GNU ld version /GNU ld /;s/GNU ld ([^)]*) /GNU ld /;s/GNU ld \([0-9.][0-9.]*\).*/\1/; q'` libgomp_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` |