scripts/lld-version.sh: Rewrite based on upstream ld-version.sh

PATCH Applied Nathan Chancellor 3 participants 4 messages Nov 15, 2021 – Nov 19, 2021 Stable branch

lore

Share & tools

lore

Nathan Chancellor

author

2021-11-15 16:46 UTC #0 lore raw

PATCH 1/1 scripts/lld-version.sh: Rewrite based on upstream ld-version.sh

This patch is for linux-5.10.y only.

When scripts/lld-version.sh was initially written, it did not account for the LLD_VENDOR cmake flag, which changes the output of ld.lld's --version flag slightly.

Without LLD_VENDOR:

$ ld.lld --version
LLD 14.0.0 (compatible with GNU linkers)

With LLD_VENDOR:

$ ld.lld --version
Debian LLD 14.0.0 (compatible with GNU linkers)

As a result, CONFIG_LLD_VERSION is messed up and configuration values that are dependent on it cannot be selected:

scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value init/Kconfig:52:warning: 'LLD_VERSION': number is invalid .config:11:warning: symbol value '00000' invalid for LLD_VERSION .config:8800:warning: override: CPU_BIG_ENDIAN changes choice state

This was fixed upstream by commit 1f09af062556 ("kbuild: Fix ld-version.sh script if LLD was built with LLD_VENDOR") in 5.12 but that was done to ld-version.sh after it was massively rewritten in commit 02aff8592204 ("kbuild: check the minimum linker version in Kconfig").

To avoid bringing in that change plus its prerequisites and fixes, just modify lld-version.sh to make it similar to the upstream ld-version.sh, which handles ld.lld with or without LLD_VENDOR and ld.bfd without any errors.

Signed-off-by Nathan Chancellor <[email protected]>

---

Our CI caught this error with newer versions of Debian's ld.lld, which added LLD_VENDOR it seems:

https://github.com/ClangBuiltLinux/continuous-integration2/runs/4206343929?check_suite_focus=true

A similar change was done by me for Android, where it has seen no issues:

https://android-review.googlesource.com/c/kernel/common/+/1744324

I believe this is a safer change than backporting the fixes from upstream but if you guys feel otherwise, I can do so. This is only needed in 5.10 as CONFIG_LLD_VERSION does not exist in 5.4 and it was fixed in 5.12 upstream.

 scripts/lld-version.sh | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

scripts/lld-version.sh +26 -9

index d70edb4d8a4f..f1eeee450a23 100755
@@ -6,15 +6,32 @@
 # Print the linker version of `ld.lld' in a 5 or 6-digit form
 # such as `100001' for ld.lld 10.0.1 etc.
 
-linker_string="$($* --version)"
+set -e
 
-if ! ( echo $linker_string | grep -q LLD ); then
+# 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.
+	echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
+}
+
+# Get the first line of the --version output.
+IFS='
+'
+set -- $(LC_ALL=C "$@" --version)
+
+# Split the line on spaces.
+IFS=' '
+set -- $1
+
+while [ $# -gt 1 -a "$1" != "LLD" ]; do
+	shift
+done
+if [ "$1" = LLD ]; then
+	echo $(get_canonical_version ${2%-*})
+else
 	echo 0
-	exit 1
 fi
-
-VERSION=$(echo $linker_string | cut -d ' ' -f 2)
-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

base-commit: bd816c278316f20a5575debc64dde4422229a880

Signature · 1 line

2.34.0.rc0

Nick Desaulniers

Reviewed-by Tested-by on v1 1/1

2021-11-15 17:50 UTC #1 lore raw

Quoted 33 lines · Nathan Chancellor

This patch is for linux-5.10.y only.
When scripts/lld-version.sh was initially written, it did not account for the LLD_VENDOR cmake flag, which changes the output of ld.lld's --version flag slightly.
Without LLD_VENDOR:
$ ld.lld --version
LLD 14.0.0 (compatible with GNU linkers)
With LLD_VENDOR:
$ ld.lld --version
Debian LLD 14.0.0 (compatible with GNU linkers)
As a result, CONFIG_LLD_VERSION is messed up and configuration values that are dependent on it cannot be selected:
scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value init/Kconfig:52:warning: 'LLD_VERSION': number is invalid .config:11:warning: symbol value '00000' invalid for LLD_VERSION .config:8800:warning: override: CPU_BIG_ENDIAN changes choice state
This was fixed upstream by commit 1f09af062556 ("kbuild: Fix ld-version.sh script if LLD was built with LLD_VENDOR") in 5.12 but that was done to ld-version.sh after it was massively rewritten in commit 02aff8592204 ("kbuild: check the minimum linker version in Kconfig").

Quoted 6 lines

To avoid bringing in that change plus its prerequisites and fixes, just modify lld-version.sh to make it similar to the upstream ld-version.sh, which handles ld.lld with or without LLD_VENDOR and ld.bfd without any errors.
Signed-off-by Nathan Chancellor <[email protected]>

Thanks for the fix.

Reviewed-by Nick Desaulniers <[email protected]>

Tested-by Nick Desaulniers <[email protected]>

Quoted 71 lines

---
Our CI caught this error with newer versions of Debian's ld.lld, which added LLD_VENDOR it seems:
https://github.com/ClangBuiltLinux/continuous-integration2/runs/4206343929?check_suite_focus=true
A similar change was done by me for Android, where it has seen no issues:
https://android-review.googlesource.com/c/kernel/common/+/1744324
I believe this is a safer change than backporting the fixes from upstream but if you guys feel otherwise, I can do so. This is only needed in 5.10 as CONFIG_LLD_VERSION does not exist in 5.4 and it was fixed in 5.12 upstream.
 scripts/lld-version.sh | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)
scripts/lld-version.sh +26 -9
index d70edb4d8a4f..f1eeee450a23 100755
@@ -6,15 +6,32 @@
 # Print the linker version of `ld.lld' in a 5 or 6-digit form
 # such as `100001' for ld.lld 10.0.1 etc.
 
-linker_string="$($* --version)"
+set -e
 
-if ! ( echo $linker_string | grep -q LLD ); then
+# 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.
+       echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
+}
+
+# Get the first line of the --version output.
+IFS='
+'
+set -- $(LC_ALL=C "$@" --version)
+
+# Split the line on spaces.
+IFS=' '
+set -- $1
+
+while [ $# -gt 1 -a "$1" != "LLD" ]; do
+       shift
+done
+if [ "$1" = LLD ]; then
+       echo $(get_canonical_version ${2%-*})
+else
        echo 0
-       exit 1
 fi
-
-VERSION=$(echo $linker_string | cut -d ' ' -f 2)
-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
base-commit: bd816c278316f20a5575debc64dde4422229a880 --
2.34.0.rc0

Signature · 2 lines

Thanks,
~Nick Desaulniers

Greg Kroah-Hartman

maintainer

2021-11-19 14:28 UTC #2 lore raw

Quoted 39 lines · Nick Desaulniers

Quoted 38 lines · Nathan Chancellor
This patch is for linux-5.10.y only.
When scripts/lld-version.sh was initially written, it did not account for the LLD_VENDOR cmake flag, which changes the output of ld.lld's --version flag slightly.
Without LLD_VENDOR:
$ ld.lld --version
LLD 14.0.0 (compatible with GNU linkers)
With LLD_VENDOR:
$ ld.lld --version
Debian LLD 14.0.0 (compatible with GNU linkers)
As a result, CONFIG_LLD_VERSION is messed up and configuration values that are dependent on it cannot be selected:
scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value scripts/lld-version.sh: 20: printf: LLD: expected numeric value init/Kconfig:52:warning: 'LLD_VERSION': number is invalid .config:11:warning: symbol value '00000' invalid for LLD_VERSION .config:8800:warning: override: CPU_BIG_ENDIAN changes choice state
This was fixed upstream by commit 1f09af062556 ("kbuild: Fix ld-version.sh script if LLD was built with LLD_VENDOR") in 5.12 but that was done to ld-version.sh after it was massively rewritten in commit 02aff8592204 ("kbuild: check the minimum linker version in Kconfig").
To avoid bringing in that change plus its prerequisites and fixes, just modify lld-version.sh to make it similar to the upstream ld-version.sh, which handles ld.lld with or without LLD_VENDOR and ld.bfd without any errors.

Quoted 5 lines

Quoted 1 line
Signed-off-by Nathan Chancellor <[email protected]>
Thanks for the fix.
Reviewed-by Nick Desaulniers <[email protected]>
Tested-by Nick Desaulniers <[email protected]>

Now queued up, thanks.

greg k-h

[email protected]

maintainer Applied

2021-11-19 14:35 UTC #3 lore raw

Patch "scripts/lld-version.sh: Rewrite based on upstream ld-version.sh" has been added to the 5.10-stable tree

In reply to Nathan Chancellor

This is a note to let you know that I've just added the patch titled

scripts/lld-version.sh: Rewrite based on upstream ld-version.sh

to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
scripts-lld-version.sh-rewrite-based-on-upstream-ld-version.sh.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From [email protected] Fri Nov 19 15:27:39 2021
From: Nathan Chancellor <[email protected]>
Date: Mon, 15 Nov 2021 09:43:23 -0700
Subject: scripts/lld-version.sh: Rewrite based on upstream ld-version.sh
To: Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: Nick Desaulniers <[email protected]>, [email protected], [email protected], Nathan Chancellor <[email protected]>
Message-ID: <[email protected]>

From: Nathan Chancellor <[email protected]>