kbuild: do not use scripts/ld-version.sh for checking spatch version
PATCH 3/3 kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaThis script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
The code was mostly copy-pasted from scripts/lld-version.sh. The two scripts can be merged, but I am keeping this as a separate file for now.
I tested this script for some corner cases reported in the past:
- GNU ld version 2.25-15.fc23
as reported by commit 8083013fc320 ("ld-version: Fix it on Fedora")
- GNU ld (GNU Binutils) 2.20.1.20100303
as reported by commit 0d61ed17dd30 ("ld-version: Drop the 4th and 5th version components")
I also cleaned up the macros in scripts/Kbuild.include. Remove ld-version, which has no direct user. You can use CONFIG_LD_VERSION if you need the version string in a Makefile.
---
init/Kconfig | 2 +- scripts/Kbuild.include | 6 +----- scripts/ld-version.sh | 31 +++++++++++++++++++++---------- 3 files changed, 23 insertions(+), 16 deletions(-)
init/Kconfig +1 -1
@@ -35,7 +35,7 @@ config GCC_VERSION config LD_VERSION int - default $(shell,$(LD) --version | $(srctree)/scripts/ld-version.sh) + default $(shell,$(srctree)/scripts/ld-version.sh $(LD)) config CC_IS_CLANG def_bool $(success,echo "$(CC_VERSION_TEXT)" | grep -q clang)
scripts/Kbuild.include +1 -5
@@ -141,13 +141,9 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y) ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3)) -# ld-version -# Note this is mainly for HJ Lu's 3 number binutil versions -ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh) - # ld-ifversion # Usage: $(call ld-ifversion, -ge, 22252, y) -ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4)) +ld-ifversion = $(shell [ $(CONFIG_LD_VERSION) $(1) $(2) ] && echo $(3) || echo $(4)) ######
scripts/ld-version.sh +21 -10
@@ -1,11 +1,22 @@ -#!/usr/bin/awk -f +#!/bin/sh # SPDX-License-Identifier: GPL-2.0 -# extract linker version number from stdin and turn into single number - { - gsub(".*\\)", ""); - gsub(".*version ", ""); - gsub("-.*", ""); - split($1,a, "."); - print a[1]*10000 + a[2]*100 + a[3]; - exit - } +# +# Usage: $ ./scripts/ld-version.sh ld +# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)" + +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0 + exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
Signature · 1 line
2.27.0
PATCH 2/3 kbuild: LD_VERSION redenomination
In reply to Masahiro YamadaCommit ccbef1674a15 ("Kbuild, lto: add ld-version and ld-ifversion macros") introduced scripts/ld-version.sh for GCC LTO.
At that time, this script handled 5 version fields because GCC LTO needed the downstream binutils. (https://lkml.org/lkml/2014/4/8/272)
The code snippet from the submitted patch was as follows:
# We need HJ Lu's Linux binutils because mainline binutils does not # support mixing assembler and LTO code in the same ld -r object. # XXX check if the gcc plugin ld is the expected one too
# XXX some Fedora binutils should also support it. How to check for that? ifeq ($(call ld-ifversion,-ge,22710001,y),y)
...
However, GCC LTO was not merged into the mainline after all.
(https://lkml.org/lkml/2014/4/8/272)
So, the 4th and 5th fields were never used, and finally removed by commit 0d61ed17dd30 ("ld-version: Drop the 4th and 5th version components").
Since then, the last 4-digits returned by this script is always zeros.
Remove the meaningless last 4-digits. This makes the version format consistent with GCC_VERSION, CLANG_VERSION, LLD_VERSION.
---
arch/arm64/Kconfig | 2 +- arch/mips/loongson64/Platform | 2 +- arch/mips/vdso/Kconfig | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/lib/Makefile | 2 +- scripts/ld-version.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/Kconfig +1 -1
@@ -1499,7 +1499,7 @@ config ARM64_PTR_AUTH depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC # Modern compilers insert a .note.gnu.property section note for PAC # which is only understood by binutils starting with version 2.33.1. - depends on LD_IS_LLD || LD_VERSION >= 233010000 || (CC_IS_GCC && GCC_VERSION < 90100) + depends on LD_IS_LLD || LD_VERSION >= 23301 || (CC_IS_GCC && GCC_VERSION < 90100) depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS) help
arch/mips/loongson64/Platform +1 -1
@@ -35,7 +35,7 @@ cflags-$(CONFIG_CPU_LOONGSON64) += $(call as-option,-Wa$(comma)-mno-fix-loongson # can't easily be used safely within the kbuild framework. # ifeq ($(call cc-ifversion, -ge, 0409, y), y) - ifeq ($(call ld-ifversion, -ge, 225000000, y), y) + ifeq ($(call ld-ifversion, -ge, 22500, y), y) cflags-$(CONFIG_CPU_LOONGSON64) += \ $(call cc-option,-march=loongson3a -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) else
arch/mips/vdso/Kconfig +1 -1
@@ -12,7 +12,7 @@ # the lack of relocations. As such, we disable the VDSO for microMIPS builds. config MIPS_LD_CAN_LINK_VDSO - def_bool LD_VERSION >= 225000000 || LD_IS_LLD + def_bool LD_VERSION >= 22500 || LD_IS_LLD config MIPS_DISABLE_VDSO def_bool CPU_MICROMIPS || (!CPU_MIPSR6 && !MIPS_LD_CAN_LINK_VDSO)
arch/powerpc/Makefile +1 -1
@@ -65,7 +65,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y)) ifdef CONFIG_PPC32 KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o else -ifeq ($(call ld-ifversion, -ge, 225000000, y),y) +ifeq ($(call ld-ifversion, -ge, 22500, y),y) # Have the linker provide sfpr if possible. # There is a corresponding test in arch/powerpc/lib/Makefile KBUILD_LDFLAGS_MODULE += --save-restore-funcs
arch/powerpc/lib/Makefile +1 -1
@@ -31,7 +31,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # 64-bit linker creates .sfpr on demand for final link (vmlinux), # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs -ifeq ($(call ld-ifversion, -lt, 225000000, y),y) +ifeq ($(call ld-ifversion, -lt, 22500, y),y) extra-$(CONFIG_PPC64) += crtsavres.o endif
scripts/ld-version.sh +1 -1
@@ -6,6 +6,6 @@ gsub(".*version ", ""); gsub("-.*", ""); split($1,a, "."); - print a[1]*100000000 + a[2]*1000000 + a[3]*10000; + print a[1]*10000 + a[2]*100 + a[3]; exit }
Signature · 7 lines
2.27.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/3 kbuild: do not use scripts/ld-version.sh for checking spatch version
scripts/ld-version.sh was, as its file name implies, originally intended for the GNU ld version, but is (ab)used for the spatch version too.
Use 'sort -CV' for the version comparison, then coccicheck does not need to use scripts/ld-version.sh. Fix nsdeps as well.
---
scripts/coccicheck | 14 +++++--------- scripts/nsdeps | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-)
scripts/coccicheck +5 -9
@@ -16,7 +16,6 @@ if [ ! -x "$SPATCH" ]; then fi SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh) USE_JOBS="no" $SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"
@@ -186,14 +185,11 @@ coccinelle () { OPT=`grep "Options:" $COCCI | cut -d':' -f2` REQ=`grep "Requires:" $COCCI | cut -d':' -f2 | sed "s| ||"` - REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh) - if [ "$REQ_NUM" != "0" ] ; then - if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then - echo "Skipping coccinelle SmPL patch: $COCCI" - echo "You have coccinelle: $SPATCH_VERSION" - echo "This SmPL patch requires: $REQ" - return - fi + if [ -n "$REQ" ] && ! { echo "$REQ"; echo "$SPATCH_VERSION"; } | sort -CV ; then + echo "Skipping coccinelle SmPL patch: $COCCI" + echo "You have coccinelle: $SPATCH_VERSION" + echo "This SmPL patch requires: $REQ" + return fi # The option '--parse-cocci' can be used to syntactically check the SmPL files.
scripts/nsdeps +1 -3
@@ -12,11 +12,9 @@ if [ ! -x "$SPATCH" ]; then exit 1 fi -SPATCH_REQ_VERSION_NUM=$(echo $SPATCH_REQ_VERSION | ${DIR}/scripts/ld-version.sh) SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh) -if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then +if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then echo "spatch needs to be version $SPATCH_REQ_VERSION or higher" exit 1 fi
Signature · 1 line
2.27.0
Quoted 7 lines · Masahiro Yamada
scripts/ld-version.shwas, as its file name implies, originally intended for the GNU ld version, but is (ab)used for the spatch version too.Use 'sort -CV' for the version comparison, then coccicheck does not need to use
scripts/ld-version.sh. Fix nsdeps as well.Signed-off-by Masahiro Yamada <[email protected]>
Applied, thanks.
julia
Quoted 58 lines
---
scripts/coccicheck | 14 +++++--------- scripts/nsdeps | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-)scripts/coccicheck +5
-9@@ -16,7 +16,6 @@ if [ ! -x "$SPATCH" ]; then fi SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh) USE_JOBS="no" $SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"@@ -186,14 +185,11 @@ coccinelle () { OPT=`grep "Options:" $COCCI | cut -d':' -f2` REQ=`grep "Requires:" $COCCI | cut -d':' -f2 | sed "s| ||"` - REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh) - if [ "$REQ_NUM" != "0" ] ; then - if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then - echo "Skipping coccinelle SmPL patch: $COCCI" - echo "You have coccinelle: $SPATCH_VERSION" - echo "This SmPL patch requires: $REQ" - return - fi + if [ -n "$REQ" ] && ! { echo "$REQ"; echo "$SPATCH_VERSION"; } | sort -CV ; then + echo "Skipping coccinelle SmPL patch: $COCCI" + echo "You have coccinelle: $SPATCH_VERSION" + echo "This SmPL patch requires: $REQ" + return fi # The option '--parse-cocci' can be used to syntactically check the SmPL files.scripts/nsdeps +1
-4@@ -12,11 +12,9 @@ if [ ! -x "$SPATCH" ]; then exit 1 fi -SPATCH_REQ_VERSION_NUM=$(echo $SPATCH_REQ_VERSION | ${DIR}/scripts/ld-version.sh) SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh) -if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then +if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then echo "spatch needs to be version $SPATCH_REQ_VERSION or higher" exit 1 fi --2.27.0
Quoted 5 lines
_______________________________________________
Cocci mailing list
[email protected]
https://systeme.lip6.fr/mailman/listinfo/cocci
_______________________________________________
Cocci mailing list
[email protected]
https://systeme.lip6.fr/mailman/listinfo/cocci
Re: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaMasahiro Yamada wrote on Sun, Dec 13, 2020:
Quoted 2 lines
This script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
Wow! I wasn't expecting so much, would have sent some rework after the upcoming merge window.
Thank you.
Some comments below that you can probably ignore, this works for me.
Quoted 14 lines
scripts/ld-version.sh +1
-7@@ -1,11 +1,22 @@ -#!/usr/bin/awk -f +#!/bin/sh # SPDX-License-Identifier: GPL-2.0 -# extract linker version number from stdin and turn into single number - { - gsub(".*\\)", ""); - gsub(".*version ", ""); - gsub("-.*", ""); - split($1,a, ".");
scripts/ld-version.sh line 9
Quoted 10 lines
scripts/ld-version.sh +7
-3- print a[1]*10000 + a[2]*100 + a[3]; - exit - } +# +# Usage: $ ./scripts/ld-version.sh ld +# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)"
Just nitpicking: this ($*) would fail if the argument contains spaces, it's generally better to use "$@" or "$1" (with quotes)
Probably doesn't matter here as gcc/clang-version scripts have the same problem, so if someone had a problem with that they probably would have reported it there.
scripts/ld-version.sh line 22
Quoted 13 lines
scripts/ld-version.sh +13
-0+ +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0 + exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
There is a bug if there is no dot at all (e.g. if binutils ever releases a version 3 and call it version 3 and not 3.0, the script would print 30303 because cut when no delimiter is found always returns the whole string)
This can be fixed by artificially appending a dot to VERSION:
VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1./')
I'm not sure it's worth worrying about either.
Thanks again,
Signature · 1 line
Dominique
kernel test robot
build botRe: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaI love your patch! Yet something to improve:
Hi Masahiro,
I love your patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on kbuild/for-next arm64/for-next/core linus/master v5.10-rc7 next-20201211] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-tqm8xx_defconfig (attached as .config) compiler: powerpc-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0eab60f5e1f804528a4d0dd9566cb30f62242d22
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 git checkout 0eab60f5e1f804528a4d0dd9566cb30f62242d22
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> /bin/sh: 1: [: -ge: unexpected operator /bin/sh: 1: [: -lt: unexpected operator -- >> /bin/sh: 1: [: -ge: unexpected operator -- >> /bin/sh: 1: [: -ge: unexpected operator
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaI love your patch! Yet something to improve:
Hi Masahiro,
I love your patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on kbuild/for-next arm64/for-next/core linus/master v5.10-rc7 next-20201211] [cannot apply to mmarek/misc]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc64-randconfig-r014-20201213 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 84c09ab44599ece409e4e19761288ddf796fceec)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install powerpc64 cross compiling tool for clang build
# apt-get install binutils-powerpc64-linux-gnu
# https://github.com/0day-ci/linux/commit/0eab60f5e1f804528a4d0dd9566cb30f62242d22
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 git checkout 0eab60f5e1f804528a4d0dd9566cb30f62242d22
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> /bin/sh: 1: [: -ge: unexpected operator /bin/sh: 1: [: -lt: unexpected operator -- >> /bin/sh: 1: [: -ge: unexpected operator -- >> /bin/sh: 1: [: -ge: unexpected operator
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaI love your patch! Yet something to improve:
Hi Masahiro,
I love your patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on kbuild/for-next arm64/for-next/core linus/master v5.10-rc7 next-20201211] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-amigaone_defconfig (attached as .config) compiler: powerpc-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0eab60f5e1f804528a4d0dd9566cb30f62242d22
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Masahiro-Yamada/kbuild-do-not-use-scripts-ld-version-sh-for-checking-spatch-version/20201213-010621 git checkout 0eab60f5e1f804528a4d0dd9566cb30f62242d22
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
/bin/sh: 1: [: -ge: unexpected operator
>> /bin/sh: 1: [: -lt: unexpected operator
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
RE: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Masahiro YamadaFrom: Masahiro Yamada
Quoted 4 lines
Sent: 12 December 2020 16:55
This script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
...
Quoted 10 lines
scripts/ld-version.sh +10
-0+# +# Usage: $ ./scripts/ld-version.sh ld +# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)" + +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0
scripts/ld-version.sh line 22
Quoted 10 lines
scripts/ld-version.sh +10
-0+ exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
Hmmmm.....
You've managed to convert an awk script into something that requires sh, head, grep, sed (twice), and cut (thrice).
Plus (probably) a few sub-shells.
It is quite ease to do it all in all in the shell.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
…
Quoted 1 line
+++ b/scripts/coccicheck
…
Quoted 1 line
(quoted diff) +0
-0@@ -186,14 +185,11 @@ coccinelle () {
…
Quoted 1 line
+ if [ -n "$REQ" ] && ! { echo "$REQ"; echo "$SPATCH_VERSION"; } | sort -CV ; then
Would it make sense to use an other command control operator?
+ if [ -n "$REQ" ] && ! { echo "$REQ" && echo "$SPATCH_VERSION"; } | sort -CV ; then
How do you think about another command variant?
+ if [ -n "$REQ" ] && ! printf "%s\n%s\n" "${REQ}" "${SPATCH_VERSION}" | sort -CV ; then
…
Quoted 2 lines
+++ b/scripts/nsdeps
(quoted diff) +0
-0@@ -12,11 +12,9 @@ if [ ! -x "$SPATCH" ]; then
…
Quoted 1 line
+if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then
Are command alternatives helpful at such a place?
+if ! { echo "$SPATCH_REQ_VERSION" && echo "$SPATCH_VERSION"; } | sort -CV ; then
Or
+if ! printf "%s\n%s\n" "${SPATCH_REQ_VERSION}" "${SPATCH_VERSION}" | sort -CV ; then
Regards,
Markus
_______________________________________________
Cocci mailing list
[email protected]
https://systeme.lip6.fr/mailman/listinfo/cocci
Re: [PATCH 2/3] kbuild: LD_VERSION redenomination
In reply to Masahiro YamadaQuoted 43 lines · Masahiro Yamada
Commit
ccbef1674a15("Kbuild, lto: add ld-version and ld-ifversion macros") introducedscripts/ld-version.shfor GCC LTO.At that time, this script handled 5 version fields because GCC LTO needed the downstream binutils. (https://lkml.org/lkml/2014/4/8/272)
The code snippet from the submitted patch was as follows:
# We need HJ Lu's Linux binutils because mainline binutils does not # support mixing assembler and LTO code in the same ld -r object. # XXX check if the gcc plugin ld is the expected one too
# XXX some Fedora binutils should also support it. How to check for that? ifeq ($(call ld-ifversion,-ge,22710001,y),y)
...However, GCC LTO was not merged into the mainline after all.
(https://lkml.org/lkml/2014/4/8/272)So, the 4th and 5th fields were never used, and finally removed by commit
0d61ed17dd30("ld-version: Drop the 4th and 5th version components").Since then, the last 4-digits returned by this script is always zeros.
Remove the meaningless last 4-digits. This makes the version format consistent with
GCC_VERSION,CLANG_VERSION,LLD_VERSION.Signed-off-by Masahiro Yamada <[email protected]>---
arch/arm64/Kconfig | 2 +- arch/mips/loongson64/Platform | 2 +- arch/mips/vdso/Kconfig | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/lib/Makefile | 2 +- scripts/ld-version.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)arch/arm64/Kconfig +0
-0
arch/arm64/Kconfig config ARM64_PTR_AUTH · line 1505
Quoted 8 lines
arch/arm64/Kconfig +1
-1@@ -1499,7 +1499,7 @@ config ARM64_PTR_AUTH depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC # Modern compilers insert a .note.gnu.property section note for PAC # which is only understood by binutils starting with version 2.33.1. - depends on LD_IS_LLD || LD_VERSION >= 233010000 || (CC_IS_GCC && GCC_VERSION < 90100) + depends on LD_IS_LLD || LD_VERSION >= 23301 || (CC_IS_GCC && GCC_VERSION < 90100) depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS) help
Will
Re: [PATCH 2/3] kbuild: LD_VERSION redenomination
In reply to Masahiro YamadaQuoted 24 lines · Masahiro Yamada
Commit
ccbef1674a15("Kbuild, lto: add ld-version and ld-ifversion macros") introducedscripts/ld-version.shfor GCC LTO.At that time, this script handled 5 version fields because GCC LTO needed the downstream binutils. (https://lkml.org/lkml/2014/4/8/272)
The code snippet from the submitted patch was as follows:
# We need HJ Lu's Linux binutils because mainline binutils does not # support mixing assembler and LTO code in the same ld -r object. # XXX check if the gcc plugin ld is the expected one too
# XXX some Fedora binutils should also support it. How to check for that? ifeq ($(call ld-ifversion,-ge,22710001,y),y)
...However, GCC LTO was not merged into the mainline after all.
(https://lkml.org/lkml/2014/4/8/272)So, the 4th and 5th fields were never used, and finally removed by commit
0d61ed17dd30("ld-version: Drop the 4th and 5th version components").Since then, the last 4-digits returned by this script is always zeros.
Quoted 8 lines
Remove the meaningless last 4-digits. This makes the version format consistent with
GCC_VERSION,CLANG_VERSION,LLD_VERSION.Signed-off-by Masahiro Yamada <[email protected]>---
arch/mips/loongson64/Platform | 2 +- arch/mips/vdso/Kconfig | 2 +-
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Re: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to Dominique MartinetQuoted 31 lines · Dominique Martinet
Masahiro Yamada wrote on Sun, Dec 13, 2020:
Quoted 2 lines
This script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
Wow! I wasn't expecting so much, would have sent some rework after the upcoming merge window.
Thank you.Some comments below that you can probably ignore, this works for me.
Quoted 19 lines
scripts/ld-version.sh +3
-10@@ -1,11 +1,22 @@ -#!/usr/bin/awk -f +#!/bin/sh # SPDX-License-Identifier: GPL-2.0 -# extract linker version number from stdin and turn into single number - { - gsub(".*\\)", ""); - gsub(".*version ", ""); - gsub("-.*", ""); - split($1,a, "."); - print a[1]*10000 + a[2]*100 + a[3]; - exit - } +# +# Usage: $ ./scripts/ld-version.sh ld
Quoted 8 lines
scripts/ld-version.sh line 9
Quoted 5 lines
scripts/ld-version.sh +5
-0+# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)"Just nitpicking: this ($*) would fail if the argument contains spaces, it's generally better to use "$@" or "$1" (with quotes)
This is just a copy-paste work based on scripts/lld-version.sh.
"$@" is better, I agree.
Quoted 3 lines
Probably doesn't matter here as gcc/clang-version scripts have the same problem, so if someone had a problem with that they probably would have reported it there.
Talking about gcc/clang-version, "$1" is not acceptable because the first word of the arguments may not be the compiler.
For example, when CC="ccache gcc" is passed in,scripts/gcc-version.sh ccache gcc
must return the gcc version.
Difference between "$@" and "$*" matters only
when it is directly passed to some command.
masahiro@grover:~$ set "a b" c d masahiro@grover:~$ ls "$*" ls: cannot access 'a b c d': No such file or directory masahiro@grover:~$ ls "$@" ls: cannot access 'a b': No such file or directory ls: cannot access 'c': No such file or directory ls: cannot access 'd': No such file or directory
"$*" was expanded into a single string, 'a b c d'.
It forgot which spaces were the part of the argument, and which spaces were argument delimiters.
In contrast, "$@" was expanded into three arguments,
'a b', 'c', and 'd'.
It correctly preserved the original arguments.
Let me continue some more experiments...
masahiro@grover:~$ set "a b" c d masahiro@grover:~$ compiler="$*" masahiro@grover:~$ ls "$compiler" ls: cannot access 'a b c d': No such file or directory masahiro@grover:~$ ls $compiler ls: cannot access 'a': No such file or directory ls: cannot access 'b': No such file or directory ls: cannot access 'c': No such file or directory ls: cannot access 'd': No such file or directory
masahiro@grover:~$ set "a b" c d masahiro@grover:~$ compiler="$@" masahiro@grover:~$ ls "$compiler" ls: cannot access 'a b c d': No such file or directory masahiro@grover:~$ ls $compiler ls: cannot access 'a': No such file or directory ls: cannot access 'b': No such file or directory ls: cannot access 'c': No such file or directory ls: cannot access 'd': No such file or directory
The result is the same.
So, whichever we use, after it is assigned to the variable "compiler", it forgets the origin of the spaces.
If we really want to preserve the passed arguments, we need to use "$@" directly in scripts/gcc-version.sh like this:
MAJOR=$(echo __GNUC__ | "$@" -E -x c - | tail -n 1)
If we do this,
scripts/gcc-version.sh ccache gcc
will succeed, and
scripts/gcc-version.sh "ccache gcc"
will fail.
Quoted 21 lines
scripts/ld-version.sh line 22
Quoted 13 lines
scripts/ld-version.sh +13
-0+ +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0 + exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVELThere is a bug if there is no dot at all (e.g. if binutils ever releases a version 3 and call it version 3 and not 3.0, the script would print 30303 because cut when no delimiter is found always returns the whole string)
This can be fixed by artificially appending a dot to VERSION:
VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1./')
Quoted 1 line
I'm not sure it's worth worrying about either.
Ah, good catch.
--
Best Regards
Masahiro Yamada
Re: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
In reply to David LaightQuoted 34 lines · David Laight
From: Masahiro Yamada
Quoted 4 lines
Sent: 12 December 2020 16:55
This script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
...
Quoted 10 lines
scripts/ld-version.sh +10
-0+# +# Usage: $ ./scripts/ld-version.sh ld +# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)" + +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0scripts/ld-version.sh line 22
Quoted 10 lines
scripts/ld-version.sh +10
-0+ exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVELHmmmm.....
You've managed to convert an awk script into something that requires sh, head, grep, sed (twice), and cut (thrice).
Plus (probably) a few sub-shells.
Quoted 4 lines
It is quite ease to do it all in all in the shell.
David
OK, please rewrite the code.
Signature · 2 lines
Best Regards Masahiro Yamada
RE: [PATCH 3/3] kbuild: rewrite ld-version.sh in shell script
From: Masahiro Yamada
Quoted 37 lines
Sent: 21 December 2020 14:29
Quoted 34 lines · David Laight
From: Masahiro Yamada
Quoted 4 lines
Sent: 12 December 2020 16:55
This script was written in awk in spite of the file extension '.sh'. Rewrite it as a shell script.
...
Quoted 10 lines
scripts/ld-version.sh +10
-0+# +# Usage: $ ./scripts/ld-version.sh ld +# +# Print the linker version of `ld' in a 5 or 6-digit form +# such as `23501' for GNU ld 2.35.1 etc. + +first_line="$($* --version | head -n 1)" + +if ! ( echo $first_line | grep -q "GNU ld"); then + echo 0scripts/ld-version.sh line 22
Quoted 10 lines
scripts/ld-version.sh +10
-0+ exit 1 +fi + +# Distributions may append an extra string like 2.35-15.fc33 +# Take the part that consists of numbers and dots. +VERSION=$(echo $first_line | sed 's/.* \([^ ]*\)$/\1/' | sed 's/^\(^[0-9.]*\).*/\1/') +MAJOR=$(echo $VERSION | cut -d . -f 1) +MINOR=$(echo $VERSION | cut -d . -f 2) +PATCHLEVEL=$(echo $VERSION | cut -d . -f 3) +printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVELHmmmm.....
You've managed to convert an awk script into something that requires sh, head, grep, sed (twice), and cut (thrice).
Plus (probably) a few sub-shells.
Quoted 6 lines
Quoted 4 lines
It is quite ease to do it all in all in the shell.
David
OK, please rewrite the code.
I've posted a couple of versions before, how about this one. I've added a few comments - which don't need to be in the final version.
# Get the first line of the 'ld --version' output
if input_from_from_stdin; then
read line
else
IFS='
'
set -- $("$@")
line="$1"fi
# Split the line on 'space' and get the last word
IFS=' '
set -- $line
shift $(($# - 1))
version="$1"
# Split on '.' and '-'
IFS='.-'
set -- $version
# The three version components are now $1 $2 and $3
# so you can do either printf "%d%02d%02d\\n" $1 $2 $3 # or echo $(($1 * 10000 + $2 * 100 + $3)) # both are builtins on recent shells (printf is most likely not to be).
So this should be the same as the script above:
#! /bin/sh
IFS='
'
set -- $("$@")
# The last word contains the version
IFS=' '
set -- $1
shift $(($# - 1))
# Get the first 3 parts of the version
IFS='.-'
set -- $1
printf "%d%02d%02d\\n" $1 $2 $3
Seems to work for me.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Re: [PATCH 2/3] kbuild: LD_VERSION redenomination
In reply to Masahiro YamadaQuoted 23 lines · Masahiro Yamada
Commit
ccbef1674a15("Kbuild, lto: add ld-version and ld-ifversion macros") introducedscripts/ld-version.shfor GCC LTO.At that time, this script handled 5 version fields because GCC LTO needed the downstream binutils. (https://lkml.org/lkml/2014/4/8/272)
The code snippet from the submitted patch was as follows:
# We need HJ Lu's Linux binutils because mainline binutils does not # support mixing assembler and LTO code in the same ld -r object. # XXX check if the gcc plugin ld is the expected one too
# XXX some Fedora binutils should also support it. How to check for that? ifeq ($(call ld-ifversion,-ge,22710001,y),y)
...However, GCC LTO was not merged into the mainline after all.
(https://lkml.org/lkml/2014/4/8/272)So, the 4th and 5th fields were never used, and finally removed by commit
0d61ed17dd30("ld-version: Drop the 4th and 5th version components").
Quoted 8 lines
Since then, the last 4-digits returned by this script is always zeros.
Remove the meaningless last 4-digits. This makes the version format consistent with
GCC_VERSION,CLANG_VERSION,LLD_VERSION.Signed-off-by Masahiro Yamada <[email protected]>---
Applied to linux-kbuild.
Quoted 88 lines
arch/arm64/Kconfig | 2 +- arch/mips/loongson64/Platform | 2 +- arch/mips/vdso/Kconfig | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/lib/Makefile | 2 +- scripts/ld-version.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)arch/arm64/Kconfig +1
-1@@ -1499,7 +1499,7 @@ config ARM64_PTR_AUTH depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC # Modern compilers insert a .note.gnu.property section note for PAC # which is only understood by binutils starting with version 2.33.1. - depends on LD_IS_LLD || LD_VERSION >= 233010000 || (CC_IS_GCC && GCC_VERSION < 90100) + depends on LD_IS_LLD || LD_VERSION >= 23301 || (CC_IS_GCC && GCC_VERSION < 90100) depends on !CC_IS_CLANG || AS_HAS_CFI_NEGATE_RA_STATE depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_REGS) helparch/mips/loongson64/Platform +1
-1@@ -35,7 +35,7 @@ cflags-$(CONFIG_CPU_LOONGSON64) += $(call as-option,-Wa$(comma)-mno-fix-loongson # can't easily be used safely within the kbuild framework. # ifeq ($(call cc-ifversion, -ge, 0409, y), y) - ifeq ($(call ld-ifversion, -ge, 225000000, y), y) + ifeq ($(call ld-ifversion, -ge, 22500, y), y) cflags-$(CONFIG_CPU_LOONGSON64) += \ $(call cc-option,-march=loongson3a -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) elsearch/mips/vdso/Kconfig +1
-1@@ -12,7 +12,7 @@ # the lack of relocations. As such, we disable the VDSO for microMIPS builds. config MIPS_LD_CAN_LINK_VDSO - def_bool LD_VERSION >= 225000000 || LD_IS_LLD + def_bool LD_VERSION >= 22500 || LD_IS_LLD config MIPS_DISABLE_VDSO def_bool CPU_MICROMIPS || (!CPU_MIPSR6 && !MIPS_LD_CAN_LINK_VDSO)arch/powerpc/Makefile +1
-1@@ -65,7 +65,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y)) ifdef CONFIG_PPC32 KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o else -ifeq ($(call ld-ifversion, -ge, 225000000, y),y) +ifeq ($(call ld-ifversion, -ge, 22500, y),y) # Have the linker provide sfpr if possible. # There is a corresponding test in arch/powerpc/lib/Makefile KBUILD_LDFLAGS_MODULE += --save-restore-funcsarch/powerpc/lib/Makefile +1
-1@@ -31,7 +31,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # 64-bit linker creates .sfpr on demand for final link (vmlinux), # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs -ifeq ($(call ld-ifversion, -lt, 225000000, y),y) +ifeq ($(call ld-ifversion, -lt, 22500, y),y) extra-$(CONFIG_PPC64) += crtsavres.o endifscripts/ld-version.sh +1
-2@@ -6,6 +6,6 @@ gsub(".*version ", ""); gsub("-.*", ""); split($1,a, "."); - print a[1]*100000000 + a[2]*1000000 + a[3]*10000; + print a[1]*10000 + a[2]*100 + a[3]; exit } --2.27.0
Signature · 2 lines
Best Regards Masahiro Yamada