diff options
| author | Martin Liska <mliska@suse.cz> | 2020-02-28 17:52:57 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-02-28 17:53:27 +0100 |
| commit | 08bf7bde9f2987b1c623d272cc71fc14a1622442 (patch) | |
| tree | 8ea6217202937b3b53beebd0fb571963c893afd1 | |
| parent | 18396541e4793382a989a23f41f5deb347610234 (diff) | |
| download | gcc-08bf7bde9f2987b1c623d272cc71fc14a1622442.zip gcc-08bf7bde9f2987b1c623d272cc71fc14a1622442.tar.gz gcc-08bf7bde9f2987b1c623d272cc71fc14a1622442.tar.bz2 | |
Improve detection of ld_date.
PR other/93965
* configure.ac: Improve detection of ld_date by requiring
either two dashes or none.
* configure: Regenerate.
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1451807..1c2692a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +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-28 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/93564 diff --git a/gcc/configure b/gcc/configure index f55cdb8..5381e10 100755 --- a/gcc/configure +++ b/gcc/configure @@ -23384,7 +23384,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 0e6e475..0d6230e 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2804,7 +2804,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]*\)'` |