From 9179ae6a0df27e3d3830ee42f755dc7d76cb0423 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 28 Feb 2020 18:52:55 +0100 Subject: [PATCH] Backport 08bf7bde9f2987b1c623d272cc71fc14a1622442 Backport from mainline 2020-02-28 Martin Liska PR other/93965 * configure.ac: Improve detection of ld_date by requiring either two dashes or none. * configure: Regenerate. --- gcc/ChangeLog | 10 ++++++++++ gcc/configure | 2 +- gcc/configure.ac | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9477068b0517..3189f258c872 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2020-02-28 Martin Liska + + Backport from mainline + 2020-02-28 Martin Liska + + PR other/93965 + * configure.ac: Improve detection of ld_date by requiring + either two dashes or none. + * configure: Regenerate. + 2020-02-27 Jakub Jelinek PR c/93949 diff --git a/gcc/configure b/gcc/configure index b4d80d140b57..a065ba237282 100755 --- a/gcc/configure +++ b/gcc/configure @@ -23046,7 +23046,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 8243716589fa..3a7251102ef6 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2658,7 +2658,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]*\)'` -- 2.47.2