On Fri, Feb 28, 2020 at 05:15:29PM +0100, Martin Liška wrote:
> Hi.
>
> The patch is about better ld date format detection as
> described in the PR in more detail. I'm also changing
> '[-]' into '-' which is a simplification.
>
> Ready to be installed after tests?
> Thanks,
> Martin
>
> gcc/ChangeLog:
>
> 2020-02-28 Martin Liska <[email protected]>
>
> PR other/93965
> * configure: Improve detection of ld_date by requiring
> either two dashes or none.
> * configure.ac: Likewise.
That is not what you did (or at least you should pretend you didn't do it that
way). Please write it as
* configure.ac: Improve ...
* configure: Regenerated.
Ok with that change.
> diff --git a/gcc/configure b/gcc/configure
> index f55cdb8c77f..5381e107bce 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 0e6e475950d..0d6230e0ca1 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]*\)'`
>
Jakub
