aboutsummaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorChung-Lin Tang <cltang@codesourcery.com>2019-07-16 07:56:41 -0700
committerThomas Schwinge <thomas@codesourcery.com>2020-03-03 12:49:59 +0100
commit495c501dd7b1473452956d07e2b3006fa9dde62f (patch)
tree9af3489bba7fe897babd89bb6db749264c0a9569 /libgomp
parent57b0df6d7a56aaf9797b9ab568b0e704dd37be7e (diff)
downloadgcc-495c501dd7b1473452956d07e2b3006fa9dde62f.zip
gcc-495c501dd7b1473452956d07e2b3006fa9dde62f.tar.gz
gcc-495c501dd7b1473452956d07e2b3006fa9dde62f.tar.bz2
Commit of https://gcc.gnu.org/ml/gcc-patches/2019-07/msg00336.html
2019-07-04 Chung-Lin Tang <cltang@codesourcery.com> libatomic/ PR other/79543 * acinclude.m4 (LIBAT_CHECK_LINKER_FEATURES): Fix GNU ld --version scanning to conform to the GNU Coding Standards. * configure: Regenerate. libffi/ PR other/79543 * acinclude.m4 (LIBAT_CHECK_LINKER_FEATURES): Fix GNU ld --version scanning to conform to the GNU Coding Standards. * configure: Regenerate. libgomp/ PR other/79543 * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Fix GNU ld --version scanning to conform to the GNU Coding Standards. * configure: Regenerate. libitm/ PR other/79543 * acinclude.m4 (LIBITM_CHECK_LINKER_FEATURES): Fix GNU ld --version scanning to conform to the GNU Coding Standards. * configure: Regenerate. libstdc++-v3/ PR other/79543 * acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Fix GNU ld --version scanning to conform to the GNU Coding Standards. * configure: Regenerate. (cherry picked from openacc-gcc-9-branch commit b3c9281e6a2f6dfdbca701626c4bc1d82fb60d8f)
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/acinclude.m42
-rwxr-xr-xlibgomp/configure2
2 files changed, 2 insertions, 2 deletions
diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4
index 51f4f30..9a15c0f 100644
--- a/libgomp/acinclude.m4
+++ b/libgomp/acinclude.m4
@@ -154,7 +154,7 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [
fi
changequote(,)
ldver=`$LD --version 2>/dev/null |
- 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'`
+ sed -e 's/[. ][0-9]\{8\}$//;s/.* \([^ ]\+\)$/\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 032620b..afceea5 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16611,7 +16611,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
fi
ldver=`$LD --version 2>/dev/null |
- 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'`
+ sed -e 's/[. ][0-9]\{8\}$//;s/.* \([^ ]\+\)$/\1/; q'`
libgomp_gnu_ld_version=`echo $ldver | \
$AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`