kbuild: remove LLVM=1 test from HAS_LTO_CLANG
Subsystems (3)
PATCH 1/4 kbuild: remove LLVM=1 test from HAS_LTO_CLANG
This guarding is wrong. As Documentation/kbuild/llvm.rst notes, LLVM=1 switches the default of tools, but you can still override CC, LD, etc. individually.
BTW, LLVM is not 1/0 flag. If LLVM is not passed in, it is empty.
Non-zero return code is all treated as failure anyway.
So, $(success,test $(LLVM) -eq 1) and $(success,test "$(LLVM)" = 1) works equivalently in the sense that both are expanded to 'n' if LLVM is not given. The difference is that the former internally fails due to syntax error.
$ test ${LLVM} -eq 1
bash: test: -eq: unary operator expected
$ echo $?
2 $ test "${LLVM}" -eq 1
bash: test: : integer expression expected
$ echo $?
2 $ test "${LLVM}" = 1
echo $?
1 $ test -n "${LLVM}"
$ echo $?
1---
arch/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/Kconfig +0 -1
@@ -632,7 +632,6 @@ config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM) -eq 1) depends on $(success,test $(LLVM_IAS) -eq 1) depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm)
Signature · 1 line
2.27.0
PATCH 2/4 kbuild: collect minimum tool versions into scripts/tool-version.sh
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update clang_min_version in scripts/cc-version.sh and also lld_min_version in scripts/ld-version.sh.
In fact, Kbuild can handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.
Make scripts/tool-version.sh a central place of minimum tool versions so that we do not need to touch multiple files.
This script prints the minimal version of the given tool.
$ scripts/tool-version.sh gcc 4.9.0 $ scripts/tool-version.sh llvm 10.0.1 $ scripts/tool-version.sh binutils 2.23.0 $ scripts/tool-version.sh foo foo: unknown tool
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/tool-version.sh
scripts/cc-version.sh +5 -15
@@ -6,18 +6,6 @@ set -e -# When you raise the minimum compiler version, please update -# Documentation/process/changes.rst as well. -gcc_min_version=4.9.0 -clang_min_version=10.0.1 -icc_min_version=16.0.3 # temporary - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -# https://lore.kernel.org/r/[email protected] -if [ "$SRCARCH" = arm64 ]; then - gcc_min_version=5.1.0 -fi - # Print the compiler name and some version components. get_compiler_info() {
@@ -48,18 +36,20 @@ set -- $(get_compiler_info "$@") name=$1 +tool_version=$(dirname $0)/tool-version.sh + case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($tool_version icc) ;; *) echo "$orig_args: unknown compiler" >&2
scripts/ld-version.sh +4 -7
@@ -6,11 +6,6 @@ set -e -# When you raise the minimum linker version, please update -# Documentation/process/changes.rst as well. -bfd_min_version=2.23.0 -lld_min_version=10.0.1 - # Convert the version string x.y.z to a canonical 5 or 6-digit form. get_canonical_version() {
@@ -35,10 +30,12 @@ set -- $("$@" --version) IFS=' ' set -- $1 +tool_version=$(dirname $0)/tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then
@@ -46,7 +43,7 @@ elif [ "$1" = GNU -a "$2" = gold ]; then exit 1 elif [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($tool_version llvm) name=LLD disp_name=LLD else
scripts/tool-version.sh new file +27 -0
@@ -0,0 +1,27 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the minimum supported version of the given tool. + +set -e + +# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +gcc_min_version=4.9.0 +llvm_min_version=10.0.1 +icc_min_version=16.0.3 # temporary +binutils_min_version=2.23.0 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 +# https://lore.kernel.org/r/[email protected] +if [ "$SRCARCH" = arm64 ]; then + gcc_min_version=5.1.0 +fi + +eval min_version="\$${1}_min_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi + +echo "$min_version"
Signature · 1 line
2.27.0
Re: [PATCH 2/4] kbuild: collect minimum tool versions into scripts/tool-version.sh
Quoted 25 lines · Masahiro Yamada
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.In fact,
Kbuildcan handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.Make
scripts/tool-version.sha central place of minimum tool versions so that we do not need to touch multiple files.This script prints the minimal version of the given tool.
$ scripts/tool-version.sh gcc 4.9.0 $ scripts/tool-version.sh llvm 10.0.1 $ scripts/tool-version.sh binutils 2.23.0 $ scripts/tool-version.sh foo foo: unknown tool
Quoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>
Two comments below.
Quoted 32 lines
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/tool-version.shscripts/cc-version.sh +0
-12@@ -6,18 +6,6 @@ set -e -# When you raise the minimum compiler version, please update -# Documentation/process/changes.rst as well. -gcc_min_version=4.9.0 -clang_min_version=10.0.1 -icc_min_version=16.0.3 # temporary - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -# https://lore.kernel.org/r/[email protected] -if [ "$SRCARCH" = arm64 ]; then - gcc_min_version=5.1.0 -fi - # Print the compiler name and some version components. get_compiler_info() {
scripts/cc-version.sh set -- $(get_compiler_info "$@") · line 39
Quoted 4 lines
scripts/cc-version.sh +1
-0@@ -48,18 +36,20 @@ set -- $(get_compiler_info "$@") name=$1 +tool_version=$(dirname $0)/tool-version.sh
I realize these scripts are currently called by their full path but is it worth making this '$(dirname "$(readlink -f "$0")")' here and in ld-version.sh just in case that does not happen?
Quoted 93 lines
scripts/cc-version.sh +3
-3case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($tool_version icc) ;; *) echo "$orig_args: unknown compiler" >&2scripts/ld-version.sh +4
-7@@ -6,11 +6,6 @@ set -e -# When you raise the minimum linker version, please update -# Documentation/process/changes.rst as well. -bfd_min_version=2.23.0 -lld_min_version=10.0.1 - # Convert the version string x.y.z to a canonical 5 or 6-digit form. get_canonical_version() {@@ -35,10 +30,12 @@ set -- $("$@" --version) IFS=' ' set -- $1 +tool_version=$(dirname $0)/tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then@@ -46,7 +43,7 @@ elif [ "$1" = GNU -a "$2" = gold ]; then exit 1 elif [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($tool_version llvm) name=LLD disp_name=LLD elsescripts/tool-version.sh new file +27
-0@@ -0,0 +1,27 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the minimum supported version of the given tool. + +set -e + +# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +gcc_min_version=4.9.0 +llvm_min_version=10.0.1 +icc_min_version=16.0.3 # temporary +binutils_min_version=2.23.0 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 +# https://lore.kernel.org/r/[email protected] +if [ "$SRCARCH" = arm64 ]; then + gcc_min_version=5.1.0 +fi + +eval min_version="\$${1}_min_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi + +echo "$min_version"Signature · 1 line
2.27.0
Would scripts/tool-version.sh be easier to read and interpret using a case statement?
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-only
#
# Print the minimum supported version of the given tool. # When you raise the minimum version, please update # Documentation/process/changes.rst as well.
case "$1" in
binutils)
echo "2.23.0"
;;
gcc)
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293
# https://lore.kernel.org/r/[email protected]
if [ "$SRCARCH" = arm64 ]; then
echo "5.1.0"
else
echo "4.9.0"
fi
;;
icc)
# temporary
echo "16.0.3"
;;
llvm)
echo "10.0.1"
;;
*)
echo "$1: unknown tool" >&2
exit 1
;;
esacRe: [PATCH 2/4] kbuild: collect minimum tool versions into scripts/tool-version.sh
Quoted 66 lines · Nathan Chancellor
Quoted 25 lines · Masahiro Yamada
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.In fact,
Kbuildcan handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.Make
scripts/tool-version.sha central place of minimum tool versions so that we do not need to touch multiple files.This script prints the minimal version of the given tool.
$ scripts/tool-version.sh gcc 4.9.0 $ scripts/tool-version.sh llvm 10.0.1 $ scripts/tool-version.sh binutils 2.23.0 $ scripts/tool-version.sh foo foo: unknown toolQuoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Two comments below.
Quoted 33 lines
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/tool-version.shscripts/cc-version.sh +0
-12@@ -6,18 +6,6 @@ set -e -# When you raise the minimum compiler version, please update -# Documentation/process/changes.rst as well. -gcc_min_version=4.9.0 -clang_min_version=10.0.1 -icc_min_version=16.0.3 # temporary - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -# https://lore.kernel.org/r/[email protected] -if [ "$SRCARCH" = arm64 ]; then - gcc_min_version=5.1.0 -fi - # Print the compiler name and some version components. get_compiler_info() {@@ -48,18 +36,20 @@ set -- $(get_compiler_info "$@")
Quoted 7 lines
scripts/cc-version.sh set -- $(get_compiler_info "$@") · line 39
Quoted 3 lines
scripts/cc-version.sh +1
-0name=$1 +tool_version=$(dirname $0)/tool-version.shI realize these scripts are currently called by their full path but is it worth making this '$(dirname "$(readlink -f "$0")")' here and in
ld-version.shjust in case that does not happen?
Not sure.
A relative path still works.
So, I did not do what I did not need to do.
Quoted 88 lines
Quoted 88 lines
scripts/cc-version.sh +3
-3case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($tool_version icc) ;; *) echo "$orig_args: unknown compiler" >&2scripts/ld-version.sh +4
-7@@ -6,11 +6,6 @@ set -e -# When you raise the minimum linker version, please update -# Documentation/process/changes.rst as well. -bfd_min_version=2.23.0 -lld_min_version=10.0.1 - # Convert the version string x.y.z to a canonical 5 or 6-digit form. get_canonical_version() {@@ -35,10 +30,12 @@ set -- $("$@" --version) IFS=' ' set -- $1 +tool_version=$(dirname $0)/tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then@@ -46,7 +43,7 @@ elif [ "$1" = GNU -a "$2" = gold ]; then exit 1 elif [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($tool_version llvm) name=LLD disp_name=LLD elsescripts/tool-version.sh new file +25
-0@@ -0,0 +1,27 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the minimum supported version of the given tool. + +set -e + +# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +gcc_min_version=4.9.0 +llvm_min_version=10.0.1 +icc_min_version=16.0.3 # temporary +binutils_min_version=2.23.0 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 +# https://lore.kernel.org/r/[email protected] +if [ "$SRCARCH" = arm64 ]; then + gcc_min_version=5.1.0 +fi + +eval min_version="\$${1}_min_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi
Quoted 8 lines
Quoted 5 lines
scripts/tool-version.sh new file +2
-1+ +echo "$min_version" --2.27.0
Would
scripts/tool-version.shbe easier to read and interpret using a case statement?
Actually, I wrote code that way.
But, I liked shorter code, and
wanted to collect magic numbers
to the top of this file.
Only the tricky part is the 'eval' statement, but I hope it would not be too difficult to understand.
Quoted 33 lines
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-only
#
# Print the minimum supported version of the given tool. # When you raise the minimum version, please update #Documentation/process/changes.rstas well.case "$1" in
binutils)echo "2.23.0" ;; gcc) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 # https://lore.kernel.org/r/[email protected] if [ "$SRCARCH" = arm64 ]; then echo "5.1.0" else echo "4.9.0" fi ;; icc) # temporary echo "16.0.3" ;; llvm) echo "10.0.1" ;; *) echo "$1: unknown tool" >&2 exit 1 ;; esac
Quoted 4 lines
--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20210304001141.7lejurony2poqkid%40archlinux-ax161.
--
Best Regards
Masahiro Yamada
Re: [PATCH 2/4] kbuild: collect minimum tool versions into scripts/tool-version.sh
In reply to Nathan ChancellorQuoted 195 lines · Nathan Chancellor
Quoted 25 lines · Masahiro Yamada
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.In fact,
Kbuildcan handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.Make
scripts/tool-version.sha central place of minimum tool versions so that we do not need to touch multiple files.This script prints the minimal version of the given tool.
$ scripts/tool-version.sh gcc 4.9.0 $ scripts/tool-version.sh llvm 10.0.1 $ scripts/tool-version.sh binutils 2.23.0 $ scripts/tool-version.sh foo foo: unknown toolQuoted 1 line
Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Two comments below.
Quoted 32 lines
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/tool-version.shscripts/cc-version.sh +0
-12@@ -6,18 +6,6 @@ set -e -# When you raise the minimum compiler version, please update -# Documentation/process/changes.rst as well. -gcc_min_version=4.9.0 -clang_min_version=10.0.1 -icc_min_version=16.0.3 # temporary - -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 -# https://lore.kernel.org/r/[email protected] -if [ "$SRCARCH" = arm64 ]; then - gcc_min_version=5.1.0 -fi - # Print the compiler name and some version components. get_compiler_info() {scripts/cc-version.sh set -- $(get_compiler_info "$@") · line 39
Quoted 4 lines
scripts/cc-version.sh +1
-0@@ -48,18 +36,20 @@ set -- $(get_compiler_info "$@") name=$1 +tool_version=$(dirname $0)/tool-version.shI realize these scripts are currently called by their full path but is it worth making this '$(dirname "$(readlink -f "$0")")' here and in
ld-version.shjust in case that does not happen?Quoted 91 lines
scripts/cc-version.sh +3
-3case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($tool_version icc) ;; *) echo "$orig_args: unknown compiler" >&2scripts/ld-version.sh +4
-7@@ -6,11 +6,6 @@ set -e -# When you raise the minimum linker version, please update -# Documentation/process/changes.rst as well. -bfd_min_version=2.23.0 -lld_min_version=10.0.1 - # Convert the version string x.y.z to a canonical 5 or 6-digit form. get_canonical_version() {@@ -35,10 +30,12 @@ set -- $("$@" --version) IFS=' ' set -- $1 +tool_version=$(dirname $0)/tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then@@ -46,7 +43,7 @@ elif [ "$1" = GNU -a "$2" = gold ]; then exit 1 elif [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($tool_version llvm) name=LLD disp_name=LLD elsescripts/tool-version.sh new file +27
-1@@ -0,0 +1,27 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the minimum supported version of the given tool. + +set -e + +# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +gcc_min_version=4.9.0 +llvm_min_version=10.0.1 +icc_min_version=16.0.3 # temporary +binutils_min_version=2.23.0 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 +# https://lore.kernel.org/r/[email protected] +if [ "$SRCARCH" = arm64 ]; then + gcc_min_version=5.1.0 +fi + +eval min_version="\$${1}_min_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi + +echo "$min_version" --Quoted 2 lines
2.27.0
Would
scripts/tool-version.shbe easier to read and interpret using a case statement?#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-only
#
# Print the minimum supported version of the given tool. # When you raise the minimum version, please update #Documentation/process/changes.rstas well.case "$1" in
binutils)echo "2.23.0" ;; gcc) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63293 # https://lore.kernel.org/r/[email protected] if [ "$SRCARCH" = arm64 ]; then echo "5.1.0" else echo "4.9.0" fi ;; icc) # temporary echo "16.0.3" ;;
Quoted 9 lines
llvm)
echo "10.0.1"
;;
*)
echo "$1: unknown tool" >&2
exit 1
;;
esacAfter some more thoughts, I think
your suggestion is better.
My patch is fragile in case the user sets
an environment variable "foo_min_version".
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 2/4] kbuild: collect minimum tool versions into scripts/tool-version.sh
In reply to Masahiro YamadaQuoted 7 lines · Masahiro Yamada
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.
Quoted 6 lines
In fact,
Kbuildcan handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.Make
scripts/tool-version.sha central place of minimum tool versions so that we do not need to touch multiple files.
It would be better and self-explanatory if a script that provides the minimum version of a tool was actually called ... min_tool-version.sh or the like. Otherwise one might think it would give e.g. the current version of installed tools.
Nicolas
Re: [PATCH 2/4] kbuild: collect minimum tool versions into scripts/tool-version.sh
Quoted 17 lines · Nicolas Pitre
Quoted 7 lines · Masahiro Yamada
The kernel build uses various tools, many of which are provided by the same software suite, for example, LLVM and Binutils.
When we raise the minimal version of Clang/LLVM, we need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.Quoted 6 lines
In fact,
Kbuildcan handle CC=clang and LD=ld.lld independently, and we could manage their minimal version separately, but it does not make much sense.Make
scripts/tool-version.sha central place of minimum tool versions so that we do not need to touch multiple files.
Quoted 7 lines
It would be better and self-explanatory if a script that provides the minimum version of a tool was actually called ...
min_tool-version.shor the like. Otherwise one might think it would give e.g. the current version of installed tools.Nicolas
You are right. I will rename it.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 3/4 kbuild: check the minimum assembler version in Kconfig
In reply to Masahiro YamadaDocumentation/process/changes.rst defines the minimum assembler version (binutils version), but we have never checked it in the build time.
Kbuild never invokes 'as' directly because all assembly files in the kernel tree are *.S, hence must be preprocessed. I do not expect raw assembly source files (*.s) would be added to the kernel tree.
Therefore, we always use $(CC) as the assembler driver, and commit aa824e0c962b ("kbuild: remove AS variable") removed 'AS'. However, we are still interested in the version of the assembler sitting behind.
As usual, the --version option prints the version string.
$ as --version | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1
But, we do not have $(AS). So, we can add the -Wa prefix so that $(CC) passes --version down to the backing assembler.
$ gcc -Wa,--version | head -n 1 gcc: fatal error: no input files compilation terminated.
OK, we need to input something to satisfy gcc.
$ gcc -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1
The combination of Clang and GNU assembler works in the same way:
$ clang -no-integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1
Clang with the integrated assembler fails like this:
$ clang -integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 clang: error: unsupported argument '--version' to option 'Wa,'
With all this in my mind, I implemented scripts/as-version.sh.
$ scripts/as-version.sh gcc GNU 23501 $ scripts/as-version.sh clang -no-integrated-as GNU 23501 $ scripts/as-version.sh clang -integrated-as LLVM 0
---
arch/Kconfig | 3 +- init/Kconfig | 12 +++++++ scripts/Kconfig.include | 6 ++++ scripts/as-version.sh | 77 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100755 scripts/as-version.sh
arch/Kconfig +1 -2
@@ -631,8 +631,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 - depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM_IAS) -eq 1) + depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) depends on ARCH_SUPPORTS_LTO_CLANG
init/Kconfig +12 -0
@@ -41,6 +41,18 @@ config CLANG_VERSION default $(cc-version) if CC_IS_CLANG default 0 +config AS_IS_GNU + def_bool $(success,test "$(as-name)" = GNU) + +config AS_IS_LLVM + def_bool $(success,test "$(as-name)" = LLVM) + +config AS_VERSION + int + # If it is integrated assembler, the version is the same as Clang's one. + default CLANG_VERSION if AS_IS_LLVM + default $(as-version) + config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD)
scripts/Kconfig.include +6 -0
@@ -45,6 +45,12 @@ $(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this compiler is not su cc-name := $(shell,set -- $(cc-info) && echo $1) cc-version := $(shell,set -- $(cc-info) && echo $2) +# Get the assembler name, version, and error out if it is not supported. +as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS)) +$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.) +as-name := $(shell,set -- $(as-info) && echo $1) +as-version := $(shell,set -- $(as-info) && echo $2) + # Get the linker name, version, and error out if it is not supported. ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD)) $(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)
scripts/as-version.sh new file +77 -0
77 lines not on this page · raw message
Signature · 1 line
2.27.0
Nathan Chancellor
maintainerRe: [PATCH 3/4] kbuild: check the minimum assembler version in Kconfig
Quoted 144 lines · Masahiro Yamada
Documentation/process/changes.rstdefines the minimum assembler version (binutils version), but we have never checked it in the build time.
Kbuildnever invokes 'as' directly because all assembly files in the kernel tree are *.S, hence must be preprocessed. I do not expect raw assembly source files (*.s) would be added to the kernel tree.Therefore, we always use $(CC) as the assembler driver, and commit
aa824e0c962b("kbuild: remove AS variable") removed 'AS'. However, we are still interested in the version of the assembler sitting behind.As usual, the --version option prints the version string.
$ as --version | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1But, we do not have $(AS). So, we can add the -Wa prefix so that $(CC) passes --version down to the backing assembler.
$ gcc -Wa,--version | head -n 1 gcc: fatal error: no input files compilation terminated.OK, we need to input something to satisfy gcc.
$ gcc -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1The combination of Clang and GNU assembler works in the same way:
$ clang -no-integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1Clang with the integrated assembler fails like this:
$ clang -integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 clang: error: unsupported argument '--version' to option 'Wa,'With all this in my mind, I implemented
scripts/as-version.sh.$ scripts/as-version.sh gcc GNU 23501 $ scripts/as-version.sh clang -no-integrated-as GNU 23501 $ scripts/as-version.sh clang -integrated-as LLVM 0Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 3 +- init/Kconfig | 12 +++++++ scripts/Kconfig.include | 6 ++++ scripts/as-version.sh | 77 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100755 scripts/as-version.sharch/Kconfig +1
-2@@ -631,8 +631,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 - depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM_IAS) -eq 1) + depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) depends on ARCH_SUPPORTS_LTO_CLANGinit/Kconfig +12
-0@@ -41,6 +41,18 @@ config CLANG_VERSION default $(cc-version) if CC_IS_CLANG default 0 +config AS_IS_GNU + def_bool $(success,test "$(as-name)" = GNU) + +config AS_IS_LLVM + def_bool $(success,test "$(as-name)" = LLVM) + +config AS_VERSION + int + # If it is integrated assembler, the version is the same as Clang's one. + default CLANG_VERSION if AS_IS_LLVM + default $(as-version) + config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD)scripts/Kconfig.include +6
-0@@ -45,6 +45,12 @@ $(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this compiler is not su cc-name := $(shell,set -- $(cc-info) && echo $1) cc-version := $(shell,set -- $(cc-info) && echo $2) +# Get the assembler name, version, and error out if it is not supported. +as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS)) +$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.) +as-name := $(shell,set -- $(as-info) && echo $1) +as-version := $(shell,set -- $(as-info) && echo $2) + # Get the linker name, version, and error out if it is not supported. ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD)) $(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)scripts/as-version.sh new file +27
-0@@ -0,0 +1,77 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the assembler name and its version in a 5 or 6-digit form. +# Also, perform the minimum version check. +# (If it is the integrated assembler, return 0 as the version, and +# the version check is skipped.) + +set -e + +# Convert the version string x.y.z to a canonical 5 or 6-digit form. +get_canonical_version() +{ + IFS=. + set -- $1 + + # If the 2nd or 3rd field is missing, fill it with a zero. + # + # The 4th field, if present, is ignored. + # This occurs in development snapshots as in 2.35.1.20201116 + echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) +} + +orig_args="$@" + +# Get the first line of the --version output. +IFS='
scripts/as-version.sh line 37
Quoted 10 lines
scripts/as-version.sh new file +10
-0+' +# Add 2>&1 to check both stdout and stderr. +# If the backing assembler is binutils, we get the version string in stdout. +# If it is clang's integrated assembler, we get the following error in stderr: +# clang: error: unsupported argument '--version' to option 'Wa,' +# To avoid the error message affected by locale, set LC_MESSAGES=C just in case. +set -- $(LC_MESSAGES=C "$@" -Wno-unused-command-line-argument -Wa,--version -c -x assembler /dev/null -o /dev/null 2>&1) +line="$1" + +if [ "$line" = "clang: error: unsupported argument '--version' to option 'Wa,'" ]; then
It looks like Debian and Ubuntu do something interesting with their clang packaging. Normally, "clang" is a symlink to "clang-#" in the same folder. In my folder from just running "ninja install"
$ ls -l clang clang-13 lrwxrwxrwx 8 nathan 2 Mar 20:58 clang -> clang-13 .rwxr-xr-x 93M nathan 2 Mar 20:58 clang-13
The same thing is true for Arch Linux:
$ ls -l /usr/bin/{clang,clang-11}
lrwxrwxrwx 8 root 17 Feb 8:54 /usr/bin/clang -> clang-11
.rwxr-xr-x 145k root 17 Feb 8:54 /usr/bin/clang-11As a result, this does not quite work.
$ LC_MESSAGES=C /usr/bin/clang -Wno-unused-command-line-argument -Wa,--version -c -x assembler /dev/null -o /dev/null clang-11: error: unsupported argument '--version' to option 'Wa,'
I am not sure what the cleanest fix would be. The rest of the patch looks okay to me.
Cheers,
Nathan
Quoted 43 lines
scripts/as-version.sh new file +40
-0+ # For the intergrated assembler, we do not check the version here. + # It is the same as the clang version, and it has been already checked + # by scripts/cc-version.sh. + echo LLVM 0 + exit 0 +fi + +# Split the line on spaces. +IFS=' ' +set -- $line + +tool_version=$(dirname $0)/tool-version.sh + +if [ "$1" = GNU -a "$2" = assembler ]; then + shift $(($# - 1)) + version=$1 + min_version=$($tool_version binutils) + name=GNU +else + echo "$orig_args: unknown assembler invoked" >&2 + exit 1 +fi + +# Some distributions append a package release number, as in 2.34-4.fc32 +# Trim the hyphen and any characters that follow. +version=${version%-*} + +cversion=$(get_canonical_version $version) +min_cversion=$(get_canonical_version $min_version) + +if [ "$cversion" -lt "$min_cversion" ]; then + echo >&2 "***" + echo >&2 "*** Assembler is too old." + echo >&2 "*** Your $name assembler version: $version" + echo >&2 "*** Minimum $name assembler version: $min_version" + echo >&2 "***" + exit 1 +fi + +echo $name $cversionSignature · 1 line
2.27.0
Re: [PATCH 3/4] kbuild: check the minimum assembler version in Kconfig
In reply to Masahiro YamadaQuoted 31 lines · Masahiro Yamada
Documentation/process/changes.rstdefines the minimum assembler version (binutils version), but we have never checked it in the build time.
Kbuildnever invokes 'as' directly because all assembly files in the kernel tree are *.S, hence must be preprocessed. I do not expect raw assembly source files (*.s) would be added to the kernel tree.Therefore, we always use $(CC) as the assembler driver, and commit
aa824e0c962b("kbuild: remove AS variable") removed 'AS'. However, we are still interested in the version of the assembler sitting behind.As usual, the --version option prints the version string.
$ as --version | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1But, we do not have $(AS). So, we can add the -Wa prefix so that $(CC) passes --version down to the backing assembler.
$ gcc -Wa,--version | head -n 1 gcc: fatal error: no input files compilation terminated.OK, we need to input something to satisfy gcc.
$ gcc -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1The combination of Clang and GNU assembler works in the same way:
Quoted 7 lines
$ clang -no-integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1Clang with the integrated assembler fails like this:
$ clang -integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 clang: error: unsupported argument '--version' to option 'Wa,'
Was this a feature request to "please implement -Wa,--version for clang?" :-P
https://github.com/ClangBuiltLinux/linux/issues/1320
Quoted 107 lines
With all this in my mind, I implemented
scripts/as-version.sh.$ scripts/as-version.sh gcc GNU 23501 $ scripts/as-version.sh clang -no-integrated-as GNU 23501 $ scripts/as-version.sh clang -integrated-as LLVM 0Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 3 +- init/Kconfig | 12 +++++++ scripts/Kconfig.include | 6 ++++ scripts/as-version.sh | 77 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100755 scripts/as-version.sharch/Kconfig +1
-2@@ -631,8 +631,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 - depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM_IAS) -eq 1) + depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) depends on ARCH_SUPPORTS_LTO_CLANGinit/Kconfig +12
-0@@ -41,6 +41,18 @@ config CLANG_VERSION default $(cc-version) if CC_IS_CLANG default 0 +config AS_IS_GNU + def_bool $(success,test "$(as-name)" = GNU) + +config AS_IS_LLVM + def_bool $(success,test "$(as-name)" = LLVM) + +config AS_VERSION + int + # If it is integrated assembler, the version is the same as Clang's one. + default CLANG_VERSION if AS_IS_LLVM + default $(as-version) + config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD)scripts/Kconfig.include +6
-0@@ -45,6 +45,12 @@ $(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this compiler is not su cc-name := $(shell,set -- $(cc-info) && echo $1) cc-version := $(shell,set -- $(cc-info) && echo $2) +# Get the assembler name, version, and error out if it is not supported. +as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS)) +$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.) +as-name := $(shell,set -- $(as-info) && echo $1) +as-version := $(shell,set -- $(as-info) && echo $2) + # Get the linker name, version, and error out if it is not supported. ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD)) $(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)scripts/as-version.sh new file +27
-0@@ -0,0 +1,77 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the assembler name and its version in a 5 or 6-digit form. +# Also, perform the minimum version check. +# (If it is the integrated assembler, return 0 as the version, and +# the version check is skipped.) + +set -e + +# Convert the version string x.y.z to a canonical 5 or 6-digit form. +get_canonical_version() +{ + IFS=. + set -- $1 + + # If the 2nd or 3rd field is missing, fill it with a zero. + # + # The 4th field, if present, is ignored. + # This occurs in development snapshots as in 2.35.1.20201116 + echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) +} + +orig_args="$@" + +# Get the first line of the --version output. +IFS='
scripts/as-version.sh line 37
Quoted 10 lines
scripts/as-version.sh new file +10
-0+' +# Add 2>&1 to check both stdout and stderr. +# If the backing assembler is binutils, we get the version string in stdout. +# If it is clang's integrated assembler, we get the following error in stderr: +# clang: error: unsupported argument '--version' to option 'Wa,' +# To avoid the error message affected by locale, set LC_MESSAGES=C just in case. +set -- $(LC_MESSAGES=C "$@" -Wno-unused-command-line-argument -Wa,--version -c -x assembler /dev/null -o /dev/null 2>&1) +line="$1" + +if [ "$line" = "clang: error: unsupported argument '--version' to option 'Wa,'" ]; then
Checking the precise error message is too brittle; what if it changes? Why not check the return code a la cc-option and friends? Is checking the return code of a subshell an issue here?
scripts/as-version.sh line 38
Quoted 1 line
scripts/as-version.sh new file +1
-0+ # For the intergrated assembler, we do not check the version here.
s/intergrated/integrated/
Quoted 42 lines
scripts/as-version.sh new file +39
-1+ # It is the same as the clang version, and it has been already checked + # by scripts/cc-version.sh. + echo LLVM 0 + exit 0 +fi + +# Split the line on spaces. +IFS=' ' +set -- $line + +tool_version=$(dirname $0)/tool-version.sh + +if [ "$1" = GNU -a "$2" = assembler ]; then + shift $(($# - 1)) + version=$1 + min_version=$($tool_version binutils) + name=GNU +else + echo "$orig_args: unknown assembler invoked" >&2 + exit 1 +fi + +# Some distributions append a package release number, as in 2.34-4.fc32 +# Trim the hyphen and any characters that follow. +version=${version%-*} + +cversion=$(get_canonical_version $version) +min_cversion=$(get_canonical_version $min_version) + +if [ "$cversion" -lt "$min_cversion" ]; then + echo >&2 "***" + echo >&2 "*** Assembler is too old." + echo >&2 "*** Your $name assembler version: $version" + echo >&2 "*** Minimum $name assembler version: $min_version" + echo >&2 "***" + exit 1 +fi + +echo $name $cversion --2.27.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [PATCH 3/4] kbuild: check the minimum assembler version in Kconfig
Quoted 157 lines · Nick Desaulniers
Quoted 31 lines · Masahiro Yamada
Documentation/process/changes.rstdefines the minimum assembler version (binutils version), but we have never checked it in the build time.
Kbuildnever invokes 'as' directly because all assembly files in the kernel tree are *.S, hence must be preprocessed. I do not expect raw assembly source files (*.s) would be added to the kernel tree.Therefore, we always use $(CC) as the assembler driver, and commit
aa824e0c962b("kbuild: remove AS variable") removed 'AS'. However, we are still interested in the version of the assembler sitting behind.As usual, the --version option prints the version string.
$ as --version | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1But, we do not have $(AS). So, we can add the -Wa prefix so that $(CC) passes --version down to the backing assembler.
$ gcc -Wa,--version | head -n 1 gcc: fatal error: no input files compilation terminated.OK, we need to input something to satisfy gcc.
$ gcc -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1The combination of Clang and GNU assembler works in the same way:
Quoted 7 lines
$ clang -no-integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1Clang with the integrated assembler fails like this:
$ clang -integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 clang: error: unsupported argument '--version' to option 'Wa,'Was this a feature request to "please implement -Wa,--version for clang?" :-P
https://github.com/ClangBuiltLinux/linux/issues/1320Quoted 113 lines
With all this in my mind, I implemented
scripts/as-version.sh.$ scripts/as-version.sh gcc GNU 23501 $ scripts/as-version.sh clang -no-integrated-as GNU 23501 $ scripts/as-version.sh clang -integrated-as LLVM 0Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 3 +- init/Kconfig | 12 +++++++ scripts/Kconfig.include | 6 ++++ scripts/as-version.sh | 77 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100755 scripts/as-version.sharch/Kconfig +1
-2@@ -631,8 +631,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 - depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM_IAS) -eq 1) + depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) depends on ARCH_SUPPORTS_LTO_CLANGinit/Kconfig +12
-0@@ -41,6 +41,18 @@ config CLANG_VERSION default $(cc-version) if CC_IS_CLANG default 0 +config AS_IS_GNU + def_bool $(success,test "$(as-name)" = GNU) + +config AS_IS_LLVM + def_bool $(success,test "$(as-name)" = LLVM) + +config AS_VERSION + int + # If it is integrated assembler, the version is the same as Clang's one. + default CLANG_VERSION if AS_IS_LLVM + default $(as-version) + config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD)scripts/Kconfig.include +6
-0@@ -45,6 +45,12 @@ $(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this compiler is not su cc-name := $(shell,set -- $(cc-info) && echo $1) cc-version := $(shell,set -- $(cc-info) && echo $2) +# Get the assembler name, version, and error out if it is not supported. +as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS)) +$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.) +as-name := $(shell,set -- $(as-info) && echo $1) +as-version := $(shell,set -- $(as-info) && echo $2) + # Get the linker name, version, and error out if it is not supported. ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD)) $(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)scripts/as-version.sh new file +33
-0@@ -0,0 +1,77 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the assembler name and its version in a 5 or 6-digit form. +# Also, perform the minimum version check. +# (If it is the integrated assembler, return 0 as the version, and +# the version check is skipped.) + +set -e + +# Convert the version string x.y.z to a canonical 5 or 6-digit form. +get_canonical_version() +{ + IFS=. + set -- $1 + + # If the 2nd or 3rd field is missing, fill it with a zero. + # + # The 4th field, if present, is ignored. + # This occurs in development snapshots as in 2.35.1.20201116 + echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) +} + +orig_args="$@" + +# Get the first line of the --version output. +IFS=' +' +# Add 2>&1 to check both stdout and stderr. +# If the backing assembler is binutils, we get the version string in stdout. +# If it is clang's integrated assembler, we get the following error in stderr: +# clang: error: unsupported argument '--version' to option 'Wa,' +# To avoid the error message affected by locale, set LC_MESSAGES=C just in case.
Quoted 8 lines
scripts/as-version.sh line 37
Quoted 4 lines
scripts/as-version.sh new file +4
-0+set -- $(LC_MESSAGES=C "$@" -Wno-unused-command-line-argument -Wa,--version -c -x assembler /dev/null -o /dev/null 2>&1) +line="$1" + +if [ "$line" = "clang: error: unsupported argument '--version' to option 'Wa,'" ]; thenChecking the precise error message is too brittle; what if it changes? Why not check the return code a la cc-option and friends? Is checking the return code of a subshell an issue here?
As Nathan pointed out, this is fragile.
I just tried my best to make this script work stand-alone.
With the only exit code chec,
scripts/as-version.sh false
would return LLVM, which is false-positive.
Probably this is not a big deal
since completely wrong input was blocked byscripts/cc-version.sh
If we give up making this script stand-alone,
another idea is to check LLVM_IAS=1, which
is passed from the top Makefile.
Yet another idea is to explicitly pass
-integrated-as as CLANG_FLAGS.
Then, this script can parse the presence
of -integrated-as.
BTW, is there any guarantee that the integrated assembler is always enabled by default? Or, is it dependent on the configuration?
The top Makefile adds -no-integrated-as if LLVM_IAS != 1, but adds nothing if LLVM_IAS == 1.
So, -integrated-as must be always default.
Quoted 52 lines
scripts/as-version.sh line 38
Quoted 2 lines
scripts/as-version.sh new file +1
-0+ # For the intergrated assembler, we do not check the version here.s/intergrated/integrated/
Quoted 40 lines
scripts/as-version.sh new file +39
-1+ # It is the same as the clang version, and it has been already checked + # by scripts/cc-version.sh. + echo LLVM 0 + exit 0 +fi + +# Split the line on spaces. +IFS=' ' +set -- $line + +tool_version=$(dirname $0)/tool-version.sh + +if [ "$1" = GNU -a "$2" = assembler ]; then + shift $(($# - 1)) + version=$1 + min_version=$($tool_version binutils) + name=GNU +else + echo "$orig_args: unknown assembler invoked" >&2 + exit 1 +fi + +# Some distributions append a package release number, as in 2.34-4.fc32 +# Trim the hyphen and any characters that follow. +version=${version%-*} + +cversion=$(get_canonical_version $version) +min_cversion=$(get_canonical_version $min_version) + +if [ "$cversion" -lt "$min_cversion" ]; then + echo >&2 "***" + echo >&2 "*** Assembler is too old." + echo >&2 "*** Your $name assembler version: $version" + echo >&2 "*** Minimum $name assembler version: $min_version" + echo >&2 "***" + exit 1 +fi + +echo $name $cversion --Quoted 2 lines
2.27.0
--
Thanks,
~Nick Desaulniers
Signature · 2 lines
Best Regards Masahiro Yamada
Nathan Chancellor
maintainerRe: [PATCH 3/4] kbuild: check the minimum assembler version in Kconfig
Quoted 182 lines · Masahiro Yamada
Quoted 157 lines · Nick Desaulniers
Quoted 31 lines · Masahiro Yamada
Documentation/process/changes.rstdefines the minimum assembler version (binutils version), but we have never checked it in the build time.
Kbuildnever invokes 'as' directly because all assembly files in the kernel tree are *.S, hence must be preprocessed. I do not expect raw assembly source files (*.s) would be added to the kernel tree.Therefore, we always use $(CC) as the assembler driver, and commit
aa824e0c962b("kbuild: remove AS variable") removed 'AS'. However, we are still interested in the version of the assembler sitting behind.As usual, the --version option prints the version string.
$ as --version | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1But, we do not have $(AS). So, we can add the -Wa prefix so that $(CC) passes --version down to the backing assembler.
$ gcc -Wa,--version | head -n 1 gcc: fatal error: no input files compilation terminated.OK, we need to input something to satisfy gcc.
$ gcc -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1The combination of Clang and GNU assembler works in the same way:
Quoted 7 lines
$ clang -no-integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 GNU assembler (GNU Binutils for Ubuntu) 2.35.1Clang with the integrated assembler fails like this:
$ clang -integrated-as -Wa,--version -c -x assembler /dev/null -o /dev/null | head -n 1 clang: error: unsupported argument '--version' to option 'Wa,'Was this a feature request to "please implement -Wa,--version for clang?" :-P
https://github.com/ClangBuiltLinux/linux/issues/1320Quoted 113 lines
With all this in my mind, I implemented
scripts/as-version.sh.$ scripts/as-version.sh gcc GNU 23501 $ scripts/as-version.sh clang -no-integrated-as GNU 23501 $ scripts/as-version.sh clang -integrated-as LLVM 0Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 3 +- init/Kconfig | 12 +++++++ scripts/Kconfig.include | 6 ++++ scripts/as-version.sh | 77 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100755 scripts/as-version.sharch/Kconfig +1
-2@@ -631,8 +631,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 - depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM_IAS) -eq 1) + depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) depends on ARCH_SUPPORTS_LTO_CLANGinit/Kconfig +12
-0@@ -41,6 +41,18 @@ config CLANG_VERSION default $(cc-version) if CC_IS_CLANG default 0 +config AS_IS_GNU + def_bool $(success,test "$(as-name)" = GNU) + +config AS_IS_LLVM + def_bool $(success,test "$(as-name)" = LLVM) + +config AS_VERSION + int + # If it is integrated assembler, the version is the same as Clang's one. + default CLANG_VERSION if AS_IS_LLVM + default $(as-version) + config LD_IS_BFD def_bool $(success,test "$(ld-name)" = BFD)scripts/Kconfig.include +6
-0@@ -45,6 +45,12 @@ $(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this compiler is not su cc-name := $(shell,set -- $(cc-info) && echo $1) cc-version := $(shell,set -- $(cc-info) && echo $2) +# Get the assembler name, version, and error out if it is not supported. +as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS)) +$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.) +as-name := $(shell,set -- $(as-info) && echo $1) +as-version := $(shell,set -- $(as-info) && echo $2) + # Get the linker name, version, and error out if it is not supported. ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD)) $(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)scripts/as-version.sh new file +33
-0@@ -0,0 +1,77 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only +# +# Print the assembler name and its version in a 5 or 6-digit form. +# Also, perform the minimum version check. +# (If it is the integrated assembler, return 0 as the version, and +# the version check is skipped.) + +set -e + +# Convert the version string x.y.z to a canonical 5 or 6-digit form. +get_canonical_version() +{ + IFS=. + set -- $1 + + # If the 2nd or 3rd field is missing, fill it with a zero. + # + # The 4th field, if present, is ignored. + # This occurs in development snapshots as in 2.35.1.20201116 + echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0})) +} + +orig_args="$@" + +# Get the first line of the --version output. +IFS=' +' +# Add 2>&1 to check both stdout and stderr. +# If the backing assembler is binutils, we get the version string in stdout. +# If it is clang's integrated assembler, we get the following error in stderr: +# clang: error: unsupported argument '--version' to option 'Wa,' +# To avoid the error message affected by locale, set LC_MESSAGES=C just in case.Quoted 8 lines
scripts/as-version.sh line 37
Quoted 4 lines
scripts/as-version.sh new file +4
-0+set -- $(LC_MESSAGES=C "$@" -Wno-unused-command-line-argument -Wa,--version -c -x assembler /dev/null -o /dev/null 2>&1) +line="$1" + +if [ "$line" = "clang: error: unsupported argument '--version' to option 'Wa,'" ]; thenChecking the precise error message is too brittle; what if it changes? Why not check the return code a la cc-option and friends? Is checking the return code of a subshell an issue here?
As Nathan pointed out, this is fragile.
I just tried my best to make this script work stand-alone.
With the only exit code chec,
scripts/as-version.shfalsewould return LLVM, which is false-positive.
Probably this is not a big deal
since completely wrong input was blocked byscripts/cc-version.sh
Quoted 8 lines
If we give up making this script stand-alone,
another idea is to check LLVM_IAS=1, which
is passed from the topMakefile.Yet another idea is to explicitly pass
-integrated-as asCLANG_FLAGS.
Then, this script can parse the presence
of -integrated-as.
This is probably the easiest thing to do for all versions of LLVM (adding -Wa,--version support to the integrated assembler as Nick suggests only fixes future versions of LLVM) and goes along with the "explicit is better than implicit" policy, which I tend to align with. It makes easy to quickly see what assembler was used when looking at a clang invocation as well.
Quoted 3 lines
BTW, is there any guarantee that the integrated assembler is always enabled by default? Or, is it dependent on the configuration?
There is a virtual method called IsIntegratedAssemblerDefault(), which defaults to false but is overridden to true by various targets. For all of the architectures/targets that the kernel cares about, this appears to be true.
Cheers,
Nathan
Quoted 68 lines
The top
Makefileadds -no-integrated-as ifLLVM_IAS!= 1, but adds nothing ifLLVM_IAS== 1.
So, -integrated-as must be always default.Quoted 52 lines
scripts/as-version.sh line 38
Quoted 2 lines
scripts/as-version.sh new file +1
-0+ # For the intergrated assembler, we do not check the version here.s/intergrated/integrated/
Quoted 40 lines
scripts/as-version.sh new file +39
-1+ # It is the same as the clang version, and it has been already checked + # by scripts/cc-version.sh. + echo LLVM 0 + exit 0 +fi + +# Split the line on spaces. +IFS=' ' +set -- $line + +tool_version=$(dirname $0)/tool-version.sh + +if [ "$1" = GNU -a "$2" = assembler ]; then + shift $(($# - 1)) + version=$1 + min_version=$($tool_version binutils) + name=GNU +else + echo "$orig_args: unknown assembler invoked" >&2 + exit 1 +fi + +# Some distributions append a package release number, as in 2.34-4.fc32 +# Trim the hyphen and any characters that follow. +version=${version%-*} + +cversion=$(get_canonical_version $version) +min_cversion=$(get_canonical_version $min_version) + +if [ "$cversion" -lt "$min_cversion" ]; then + echo >&2 "***" + echo >&2 "*** Assembler is too old." + echo >&2 "*** Your $name assembler version: $version" + echo >&2 "*** Minimum $name assembler version: $min_version" + echo >&2 "***" + exit 1 +fi + +echo $name $cversion --Quoted 2 lines
2.27.0
--
Thanks,
~Nick DesaulniersSignature · 2 lines
Best Regards Masahiro Yamada
PATCH 4/4 kbuild: dwarf: use AS_VERSION instead of test_dwarf5_support.sh
In reply to Masahiro YamadaThe test code in scripts/test_dwarf5_support.sh is somewhat difficult to understand, but after all, we want to check binutils >= 2.35.2
From the former discussion, the requrement for generating DRAWF v5 from C code is as follows:
- gcc + binutils as -> requires gcc 5.0+ (but 7.0+ for full support)
- clang + binutils as -> requires binutils 2.35.2+
- clang + integrated as -> OK
---
lib/Kconfig.debug | 3 +-- scripts/test_dwarf5_support.sh | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100755 scripts/test_dwarf5_support.sh
lib/Kconfig.debug +1 -2
@@ -284,8 +284,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" - depends on GCC_VERSION >= 50000 || CC_IS_CLANG - depends on CC_IS_GCC || $(success,$(srctree)/scripts/test_dwarf5_support.sh $(CC) $(CLANG_FLAGS)) + depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && AS_IS_GNU && AS_VERSION >= 23502) || (CC_IS_CLANG && AS_IS_LLVM) depends on !DEBUG_INFO_BTF help Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gcc
scripts/test_dwarf5_support.sh deleted +0 -8
@@ -1,8 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -# Test that the assembler doesn't need -Wa,-gdwarf-5 when presented with DWARF -# v5 input, such as `.file 0` and `md5 0x00`. Should be fixed in GNU binutils -# 2.35.2. https://sourceware.org/bugzilla/show_bug.cgi?id=25611 -echo '.file 0 "filename" md5 0x7a0b65214090b6693bd1dc24dd248245' | \ - $* -gdwarf-5 -Wno-unused-command-line-argument -c -x assembler -o /dev/null -
Signature · 1 line
2.27.0
Re: [PATCH 4/4] kbuild: dwarf: use AS_VERSION instead of test_dwarf5_support.sh
Quoted 5 lines · Masahiro Yamada
The test code in
scripts/test_dwarf5_support.shis somewhat difficult to understand, but after all, we want to check binutils >= 2.35.2From the former discussion, the requrement for generating DRAWF v5 from
^typos: s/requrement/requirement, s/DRAWF/DWARF
(in vim you can :set spell (:set nospell to disable), there's probably a nice way to auto set this on buffer entry for a commit message)
Quoted 5 lines
C code is as follows:
- gcc + binutils as -> requires gcc 5.0+ (but 7.0+ for full support)
- clang + binutils as -> requires binutils 2.35.2+
- clang + integrated as -> OK
Yes. Thanks for the patch.
Quoted 14 lines
Signed-off-by Masahiro Yamada <[email protected]>---
lib/Kconfig.debug | 3 +-- scripts/test_dwarf5_support.sh | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100755 scripts/test_dwarf5_support.shlib/Kconfig.debug +0
-0
lib/Kconfig.debug config DEBUG_INFO_DWARF4 · line 287
Quoted 6 lines
lib/Kconfig.debug +1
-2@@ -284,8 +284,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" - depends on GCC_VERSION >= 50000 || CC_IS_CLANG - depends on CC_IS_GCC || $(success,$(srctree)/scripts/test_dwarf5_support.sh $(CC) $(CLANG_FLAGS)) + depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && AS_IS_GNU && AS_VERSION >= 23502) || (CC_IS_CLANG && AS_IS_LLVM)
Would this be more concise as:
+ depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && (AS_IS_LLVM
|| (AS_IS_GNU && AS_VERSION >= 23502))
Quoted 20 lines
lib/Kconfig.debug +0
-0depends on !DEBUG_INFO_BTF help Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gccscripts/test_dwarf5_support.sh deleted +0
-9@@ -1,8 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -# Test that the assembler doesn't need -Wa,-gdwarf-5 when presented with DWARF -# v5 input, such as `.file 0` and `md5 0x00`. Should be fixed in GNU binutils -# 2.35.2. https://sourceware.org/bugzilla/show_bug.cgi?id=25611 -echo '.file 0 "filename" md5 0x7a0b65214090b6693bd1dc24dd248245' | \ - $* -gdwarf-5 -Wno-unused-command-line-argument -c -x assembler -o /dev/null - --2.27.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Re: [PATCH 4/4] kbuild: dwarf: use AS_VERSION instead of test_dwarf5_support.sh
Quoted 6 lines · Nick Desaulniers' via Clang Built Linux
Quoted 4 lines · Masahiro Yamada
The test code in
scripts/test_dwarf5_support.shis somewhat difficult to understand, but after all, we want to check binutils >= 2.35.2
Quoted 7 lines
Quoted 1 line
From the former discussion, the requrement for generating DRAWF v5 from
^typos: s/requrement/requirement, s/DRAWF/DWARF
(in vim you can
:set spell(:set nospellto disable), there's probably a nice way to auto set this on buffer entry for a commit message)
I cannot be accustomed to vim.
I use emacs for coding, and nano editor
for editing simple text files, and input commit log.
I invoke aspell from nano (Ctrl-t, Ctrl-s), but I sometimes forget to do spell checking.
Quoted 11 lines
lib/Kconfig.debug config DEBUG_INFO_DWARF4 · line 287
Quoted 6 lines
config
DEBUG_INFO_DWARF5
bool "Generate DWARF Version 5 debuginfo"lib/Kconfig.debug +1
-2- depends on GCC_VERSION >= 50000 || CC_IS_CLANG - depends on CC_IS_GCC || $(success,$(srctree)/scripts/test_dwarf5_support.sh $(CC) $(CLANG_FLAGS)) + depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && AS_IS_GNU && AS_VERSION >= 23502) || (CC_IS_CLANG && AS_IS_LLVM)Would this be more concise as:
+ depends onGCC_VERSION>= 50000 || (CC_IS_CLANG&& (AS_IS_LLVM
|| (AS_IS_GNU&&AS_VERSION>= 23502))
Yes, this is simpler.
I will do it in v2.
Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 4/4] kbuild: dwarf: use AS_VERSION instead of test_dwarf5_support.sh
In reply to Masahiro YamadaQuoted 11 lines · Masahiro Yamada
The test code in
scripts/test_dwarf5_support.shis somewhat difficult to understand, but after all, we want to check binutils >= 2.35.2Quoted 1 line
From the former discussion, the requrement for generating DRAWF v5 from
C code is as follows:
- gcc + binutils as -> requires gcc 5.0+ (but 7.0+ for full support)
- clang + binutils as -> requires binutils 2.35.2+
- clang + integrated as -> OKSigned-off-by Masahiro Yamada <[email protected]>
Quoted 38 lines
---
lib/Kconfig.debug | 3 +-- scripts/test_dwarf5_support.sh | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100755 scripts/test_dwarf5_support.shlib/Kconfig.debug +1
-2@@ -284,8 +284,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" - depends on GCC_VERSION >= 50000 || CC_IS_CLANG - depends on CC_IS_GCC || $(success,$(srctree)/scripts/test_dwarf5_support.sh $(CC) $(CLANG_FLAGS)) + depends on GCC_VERSION >= 50000 || (CC_IS_CLANG && AS_IS_GNU && AS_VERSION >= 23502) || (CC_IS_CLANG && AS_IS_LLVM) depends on !DEBUG_INFO_BTF help Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gccscripts/test_dwarf5_support.sh deleted +0
-8@@ -1,8 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -# Test that the assembler doesn't need -Wa,-gdwarf-5 when presented with DWARF -# v5 input, such as `.file 0` and `md5 0x00`. Should be fixed in GNU binutils -# 2.35.2. https://sourceware.org/bugzilla/show_bug.cgi?id=25611 -echo '.file 0 "filename" md5 0x7a0b65214090b6693bd1dc24dd248245' | \ - $* -gdwarf-5 -Wno-unused-command-line-argument -c -x assembler -o /dev/null -Signature · 1 line
2.27.0
+ Sami
Quoted 6 lines · Masahiro Yamada
This guarding is wrong. As
Documentation/kbuild/llvm.rstnotes, LLVM=1 switches the default of tools, but you can still override CC, LD, etc. individually.BTW, LLVM is not 1/0 flag. If LLVM is not passed in, it is empty.
Do we have the same problem with LLVM_IAS? LGTM otherwise, but wanted to check that before signing off.
(Also, the rest of the patches in this series seem more related to DWARFv5 cleanups; this patch seems orthogonal while those are a visible progression).
Quoted 37 lines
Non-zero return code is all treated as failure anyway.
So, $(success,test $(LLVM) -eq 1) and $(success,test "$(LLVM)" = 1) works equivalently in the sense that both are expanded to 'n' if LLVM is not given. The difference is that the former internally fails due to syntax error.
$ test ${LLVM} -eq 1 bash: test: -eq: unary operator expected $ echo $? 2$ test "${LLVM}" -eq 1 bash: test: : integer expression expected $ echo $? 2$ test "${LLVM}" = 1 echo $? 1$ test -n "${LLVM}" $ echo $? 1Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 1 - 1 file changed, 1 deletion(-)arch/Kconfig +0
-0
arch/Kconfig config HAS_LTO_CLANG · line 635
Quoted 4 lines
arch/Kconfig +0
-1@@ -632,7 +632,6 @@ config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM) -eq 1)
IIRC, we needed some other LLVM utilities like llvm-nm and llvm-ar, which are checked below. So I guess we can still support CC=clang AR=llvm-ar NM=llvm-nm, and this check is redundant.
Quoted 6 lines
arch/Kconfig +0
-1depends on $(success,test $(LLVM_IAS) -eq 1) depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) --2.27.0
--
Thanks,
~Nick Desaulniers
Quoted 5 lines · Nick Desaulniers' via Clang Built Linux
+ Sami
Quoted 1 line · Masahiro Yamada
Quoted 8 lines
Quoted 5 lines
This guarding is wrong. As
Documentation/kbuild/llvm.rstnotes, LLVM=1 switches the default of tools, but you can still override CC, LD, etc. individually.BTW, LLVM is not 1/0 flag. If LLVM is not passed in, it is empty.
Do we have the same problem with
LLVM_IAS? LGTM otherwise, but wanted to check that before signing off.
3/4 will replace this LLVM_IAS check with AS_IS_LLVM.
We do not need to add a noise change.
Quoted 4 lines
(Also, the rest of the patches in this series seem more related to DWARFv5 cleanups; this patch seems orthogonal while those are a visible progression).
Kind of orthogonal, but I am touching the same code hunk, which would cause a merge conflict.
Quoted 32 lines
Quoted 32 lines
Non-zero return code is all treated as failure anyway.
So, $(success,test $(LLVM) -eq 1) and $(success,test "$(LLVM)" = 1) works equivalently in the sense that both are expanded to 'n' if LLVM is not given. The difference is that the former internally fails due to syntax error.
$ test ${LLVM} -eq 1 bash: test: -eq: unary operator expected $ echo $? 2$ test "${LLVM}" -eq 1 bash: test: : integer expression expected $ echo $? 2$ test "${LLVM}" = 1 echo $? 1$ test -n "${LLVM}" $ echo $? 1Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 1 - 1 file changed, 1 deletion(-)
Quoted 13 lines
arch/Kconfig config HAS_LTO_CLANG · line 635
Quoted 9 lines
arch/Kconfig +0
-1@@ -632,7 +632,6 @@ config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM) -eq 1)IIRC, we needed some other LLVM utilities like llvm-nm and llvm-ar, which are checked below. So I guess we can still support CC=clang AR=llvm-ar NM=llvm-nm, and this check is redundant.
Yes, I think so.
Quoted 17 lines
Quoted 7 lines
arch/Kconfig +0
-1depends on $(success,test $(LLVM_IAS) -eq 1) depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm) --2.27.0
--
Thanks,
~Nick Desaulniers--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/CAKwvOdkhZGv_q9vgDdYY44OrbzmMD_E%2BGL3SyOk-jQ0kdXtMzg%40mail.gmail.com.
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 50 lines · Nick Desaulniers
+ Sami
Quoted 6 lines · Masahiro Yamada
This guarding is wrong. As
Documentation/kbuild/llvm.rstnotes, LLVM=1 switches the default of tools, but you can still override CC, LD, etc. individually.BTW, LLVM is not 1/0 flag. If LLVM is not passed in, it is empty.
Do we have the same problem with
LLVM_IAS? LGTM otherwise, but wanted to check that before signing off.(Also, the rest of the patches in this series seem more related to DWARFv5 cleanups; this patch seems orthogonal while those are a visible progression).
Quoted 32 lines
Non-zero return code is all treated as failure anyway.
So, $(success,test $(LLVM) -eq 1) and $(success,test "$(LLVM)" = 1) works equivalently in the sense that both are expanded to 'n' if LLVM is not given. The difference is that the former internally fails due to syntax error.
$ test ${LLVM} -eq 1 bash: test: -eq: unary operator expected $ echo $? 2$ test "${LLVM}" -eq 1 bash: test: : integer expression expected $ echo $? 2$ test "${LLVM}" = 1 echo $? 1$ test -n "${LLVM}" $ echo $? 1Signed-off-by Masahiro Yamada <[email protected]>---
arch/Kconfig | 1 - 1 file changed, 1 deletion(-)
Quoted 13 lines
arch/Kconfig config HAS_LTO_CLANG · line 635
Quoted 9 lines
arch/Kconfig +0
-1@@ -632,7 +632,6 @@ config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM) -eq 1)IIRC, we needed some other LLVM utilities like llvm-nm and llvm-ar, which are checked below. So I guess we can still support CC=clang AR=llvm-ar NM=llvm-nm, and this check is redundant.
I'm fine with removing the check, but the idea here was to just make it slightly harder for people to accidentally use a mismatched toolchain, even though checking for LLVM=1 doesn't stop them from doing so anyway. But yes, the only LLVM tools required in addition to the compiler and the linker are llvm-ar and llvm-nm.
Sami
Quoted 27 lines · Masahiro Yamada
This guarding is wrong. As
Documentation/kbuild/llvm.rstnotes, LLVM=1 switches the default of tools, but you can still override CC, LD, etc. individually.BTW, LLVM is not 1/0 flag. If LLVM is not passed in, it is empty.
Non-zero return code is all treated as failure anyway.
So, $(success,test $(LLVM) -eq 1) and $(success,test "$(LLVM)" = 1) works equivalently in the sense that both are expanded to 'n' if LLVM is not given. The difference is that the former internally fails due to syntax error.
$ test ${LLVM} -eq 1 bash: test: -eq: unary operator expected $ echo $? 2$ test "${LLVM}" -eq 1 bash: test: : integer expression expected $ echo $? 2$ test "${LLVM}" = 1 echo $? 1
Quoted 5 lines
$ test -n "${LLVM}" $ echo $? 1Signed-off-by Masahiro Yamada <[email protected]>
Yes, there is not too much point of checking if $(LLVM) is set or not because we already check for the other tools.
Quoted 20 lines
---
arch/Kconfig | 1 - 1 file changed, 1 deletion(-)arch/Kconfig +0
-1@@ -632,7 +632,6 @@ config HAS_LTO_CLANG def_bool y # Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510 depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD - depends on $(success,test $(LLVM) -eq 1) depends on $(success,test $(LLVM_IAS) -eq 1) depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm) depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm)Signature · 1 line
2.27.0