Backport 08bf7bde9f2987b1c623d272cc71fc14a1622442

	Backport from mainline
	2020-02-28  Martin Liska  <mliska@suse.cz>

	PR other/93965
	* configure.ac: Improve detection of ld_date by requiring
	either two dashes or none.
	* configure: Regenerate.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0c4d28b5475a4e586ddded005dc0518b76b3445..749686468864097777839eab173ee76bade668ee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2020-03-02  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2020-02-28  Martin Liska  <mliska@suse.cz>
+
+       PR other/93965
+       * configure.ac: Improve detection of ld_date by requiring
+       either two dashes or none.
+       * configure: Regenerate.
+
 2020-02-29  Peter Bergner  <bergner@linux.ibm.com>
 
        Revert

diff --git a/gcc/configure b/gcc/configure
index 7313088fc2cfebf4a69b3165dbe421bfe1208aa9..97ba7d7d69c9c8a8c19ddcd265035f5ea9aabaf4 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -22785,7 +22785,7 @@ if test $in_tree_ld != yes ; then
       ld_vers=`echo $ld_ver | sed -n \
          -e 's,^.*[     ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
     fi
-    ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+    ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)\(-*\)\([01][0-9]\)\2\([0-3][0-9]\).*$,\1\3\4,p'`
     ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
     ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
     ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 9bed32ad43f6959f60e1cceb1d3a684ab134460c..d6f2d5b2ed046a5fe7aa22e1439e868fbf75a835 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2580,7 +2580,7 @@ if test $in_tree_ld != yes ; then
       ld_vers=`echo $ld_ver | sed -n \
          -e 's,^.*[     ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
     fi
-    ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+    ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)\(-*\)\([01][0-9]\)\2\([0-3][0-9]\).*$,\1\3\4,p'`
     ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
     ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
     ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`