kbuild: collect minimum tool versions into scripts/min-tool-version.sh
PATCH 1/1 kbuild: collect minimum tool versions into scripts/min-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 you raise the minimum version of Clang/LLVM, you need to update clang_min_version in scripts/cc-version.sh and also lld_min_version in scripts/ld-version.sh.
Kbuild can handle CC=clang and LD=ld.lld independently, but it does not make much sense to maintain their versions separately.
Let's make scripts/min-tool-version.sh a central place of minimum tool versions so you do not need to touch multiple files.
This script prints the minimum version of the given tool.
$ scripts/min-tool-version.sh gcc 4.9.0 $ scripts/min-tool-version.sh llvm 10.0.1 $ scripts/min-tool-version.sh binutils 2.23.0 $ scripts/min-tool-version.sh foo foo: unknown tool
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/min-tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/min-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 +min_tool_version=$(dirname $0)/min-tool-version.sh + case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($min_tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($min_tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($min_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 +min_tool_version=$(dirname $0)/min-tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($min_tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then
@@ -51,7 +48,7 @@ else if [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($min_tool_version llvm) name=LLD disp_name=LLD else
scripts/min-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. +min_gcc_version=4.9.0 +min_llvm_version=10.0.1 +min_icc_version=16.0.3 # temporary +min_binutils_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 + min_gcc_version=5.1.0 +fi + +eval min_version="\$min_${1}_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi + +echo "$min_version"
Signature · 1 line
2.27.0
scripts/min-tool-version.sh line 13
Quoted 7 lines · Masahiro Yamada
scripts/min-tool-version.sh new file +6
-0+# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +min_gcc_version=4.9.0 +min_llvm_version=10.0.1 +min_icc_version=16.0.3 # temporary +min_binutils_version=2.23.0
+1 to creating a central place for all minimum versions.
I wonder if you considered creating a folder with files like scripts/min_versions/gcc containing the version string. That would make it easier for reading from other languages or even importing them dynamically into the documentation, thus removing even more duplication.
Cheers,
Miguel
Quoted 14 lines · Miguel Ojeda
scripts/min-tool-version.sh line 13
Quoted 7 lines · Masahiro Yamada
scripts/min-tool-version.sh new file +6
-0+# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +min_gcc_version=4.9.0 +min_llvm_version=10.0.1 +min_icc_version=16.0.3 # temporary +min_binutils_version=2.23.0+1 to creating a central place for all minimum versions.
Acked-by Miguel Ojeda <[email protected]>
Quoted 8 lines
I wonder if you considered creating a folder with files like
scripts/min_versions/gcccontaining the version string. That would make it easier for reading from other languages or even importing them dynamically into the documentation, thus removing even more duplication.Cheers,
Miguel
Hmm, that is a simple, clean idea.
Then, we can simply read out the file
$ cat scripts/min_versions/gcc 4.9.0
I do not know how to handle
per-arch versions in this case.
Or, we might need to stick to shell-scripting
to handle this.
scripts/min_versions/gcc
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-only
if [ "$SRCARCH" = arm64 ]; then
echo 5.1.0
else
echo 4.9.0fi
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 6 lines · Masahiro Yamada
Hmm, that is a simple, clean idea.
Then, we can simply read out the file$ cat scripts/min_versions/gcc 4.9.0
Exactly!
Quoted 2 lines
I do not know how to handle
per-arch versions in this case.
Perhaps we should just push for 5.1.0 everywhere ;-P
Otherwise, we could still have min-tool-versions.sh with something like:
$ cat scripts/min_versions/gcc
4.9.0
$ cat scripts/min_versions/gcc_arm64
5.1.0
$ cat scripts/min-tool-versions.sh
if min_versions/$tool_$arch exists
print that one
else
print the default one: min_versions/$tooli.e. having the plain files allow us to extend the cases without listing them explicitly in the script, plus it is anyway useful to separate data from code :-)
Cheers,
Miguel
Quoted 11 lines · Miguel Ojeda
scripts/min-tool-version.sh line 13
Quoted 7 lines · Masahiro Yamada
scripts/min-tool-version.sh new file +6
-0+# When you raise the minimum version, please update +# Documentation/process/changes.rst as well. +min_gcc_version=4.9.0 +min_llvm_version=10.0.1 +min_icc_version=16.0.3 # temporary +min_binutils_version=2.23.0+1 to creating a central place for all minimum versions.
Quoted 7 lines
Acked-by Miguel Ojeda <[email protected]>I wonder if you considered creating a folder with files like
scripts/min_versions/gcccontaining the version string. That would make it easier for reading from other languages or even importing them dynamically into the documentation, thus removing even more duplication.
Alternatively, the documentation could be the actual reference and the script would parse the documentation to get those values out.
Nicolas
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 you raise the minimum version of Clang/LLVM, you need to update
clang_min_versioninscripts/cc-version.shand alsolld_min_versioninscripts/ld-version.sh.
Kbuildcan handle CC=clang and LD=ld.lld independently, but it does not make much sense to maintain their versions separately.Let's make
scripts/min-tool-version.sha central place of minimum tool versions so you do not need to touch multiple files.This script prints the minimum version of the given tool.
$ scripts/min-tool-version.sh gcc 4.9.0 $ scripts/min-tool-version.sh llvm 10.0.1 $ scripts/min-tool-version.sh binutils 2.23.0 $ scripts/min-tool-version.sh foo foo: unknown tool
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>
The idea with creating gcc, llvm, binutils etc. files containing the minimum version-string sounds good to me.
This version here tested on Debian/testing AMD64.
- Sedat -
Quoted 134 lines
---
scripts/cc-version.sh | 20 +++++--------------- scripts/ld-version.sh | 11 ++++------- scripts/min-tool-version.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100755 scripts/min-tool-version.shscripts/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 +min_tool_version=$(dirname $0)/min-tool-version.sh + case "$name" in GCC) version=$2.$3.$4 - min_version=$gcc_min_version + min_version=$($min_tool_version gcc) ;; Clang) version=$2.$3.$4 - min_version=$clang_min_version + min_version=$($min_tool_version llvm) ;; ICC) version=$(($2 / 100)).$(($2 % 100)).$3 - min_version=$icc_min_version + min_version=$($min_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 +min_tool_version=$(dirname $0)/min-tool-version.sh + if [ "$1" = GNU -a "$2" = ld ]; then shift $(($# - 1)) version=$1 - min_version=$bfd_min_version + min_version=$($min_tool_version binutils) name=BFD disp_name="GNU ld" elif [ "$1" = GNU -a "$2" = gold ]; then@@ -51,7 +48,7 @@ else if [ "$1" = LLD ]; then version=$2 - min_version=$lld_min_version + min_version=$($min_tool_version llvm) name=LLD disp_name=LLD elsescripts/min-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. +min_gcc_version=4.9.0 +min_llvm_version=10.0.1 +min_icc_version=16.0.3 # temporary +min_binutils_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 + min_gcc_version=5.1.0 +fi + +eval min_version="\$min_${1}_version" +if [ -z "$min_version" ]; then + echo "$1: unknown tool" >&2 + exit 1 +fi + +echo "$min_version" --2.27.0
--
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/20210311094624.923913-1-masahiroy%40kernel.org.