aboutsummaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorChung-Lin Tang <cltang@codesourcery.com>2019-09-03 14:10:26 +0000
committerChung-Lin Tang <cltang@gcc.gnu.org>2019-09-03 14:10:26 +0000
commitc6c2d1bc9bc3eb3606af6a198e74170bd906e199 (patch)
tree8499b89622c0dc03bdd5f00be7cb685df4e30135 /libgomp
parentc8d3491299d4680847c2899a8ef1a34ad880cdb0 (diff)
downloadgcc-c6c2d1bc9bc3eb3606af6a198e74170bd906e199.zip
gcc-c6c2d1bc9bc3eb3606af6a198e74170bd906e199.tar.gz
gcc-c6c2d1bc9bc3eb3606af6a198e74170bd906e199.tar.bz2
re PR other/79543 (Inappropriate "ld --version" checking)
2019-09-03 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. From-SVN: r275341
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog7
-rw-r--r--libgomp/acinclude.m42
-rwxr-xr-xlibgomp/configure2
3 files changed, 9 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 3d23b58..a627bc22 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-03 Chung-Lin Tang <cltang@codesourcery.com>
+
+ PR other/79543
+ * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Fix GNU ld --version
+ scanning to conform to the GNU Coding Standards.
+ * configure: Regenerate.
+
2019-08-28 Jakub Jelinek <jakub@redhat.com>
PR libgomp/91530
diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4
index 51f4f30..dbf54d0 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,\}\)$/\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 fd7394b..c5797ea 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16587,7 +16587,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,\}\)$/\1/; q'`
libgomp_gnu_ld_version=`echo $ldver | \
$AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`