linux-kernel - Re: [PATCH] kbuild: dummy-tools: adjust to scripts/cc-version.sh

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 9 Mar 2021 10:37:45 -0700
From:   Nathan Chancellor <nathan@...nel.org>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     linux-kbuild@...r.kernel.org, Jiri Slaby <jslaby@...e.cz>,
        Jiri Slaby <jirislaby@...nel.org>,
        Miguel Ojeda <ojeda@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        Philipp Rudo <prudo@...ux.ibm.com>,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] kbuild: dummy-tools: adjust to scripts/cc-version.sh

On Wed, Mar 10, 2021 at 01:25:45AM +0900, Masahiro Yamada wrote:
> Commit aec6c60a01d3 ("kbuild: check the minimum compiler version in
> Kconfig") changed how the script detects the compiler version.
> 
> Get 'make CROSS_COMPILE=scripts/dummy-tools/' back working again.
> 
> Fixes: aec6c60a01d3 ("kbuild: check the minimum compiler version in Kconfig")
> Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>

Reviewed-by: Nathan Chancellor <nathan@...nel.org>
Tested-by: Nathan Chancellor <nathan@...nel.org>

> ---
> 
> Perhaps, Jiri may have already noticed this issue, and have a similar patch.
> I just checked ML, but I did not find a patch to fix this.
> 
> 
>  scripts/dummy-tools/gcc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc
> index 7b10332b23ba..39e65fee59bd 100755
> --- a/scripts/dummy-tools/gcc
> +++ b/scripts/dummy-tools/gcc
> @@ -57,9 +57,9 @@ if arg_contain --version "$@"; then
>  fi
>  
>  if arg_contain -E "$@"; then
> -	# For scripts/gcc-version.sh; This emulates GCC 20.0.0
> +	# For scripts/cc-version.sh; This emulates GCC 20.0.0
>  	if arg_contain - "$@"; then
> -		sed 's/^__GNUC__$/20/; s/^__GNUC_MINOR__$/0/; s/^__GNUC_PATCHLEVEL__$/0/'
> +		sed -n '/^GCC/{s/__GNUC__/20/; s/__GNUC_MINOR__/0/; s/__GNUC_PATCHLEVEL__/0/; p;}'
>  		exit 0
>  	else
>  		echo "no input files" >&2
> -- 
> 2.27.0
>