Commit 624e847d authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Zheng Zengkai
Browse files

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

stable inclusion
from stable-5.10.81
commit df58fb431aa3b8371e11b27a94b20f8b765799c7
bugzilla: 185832 https://gitee.com/openeuler/kernel/issues/I4L9CF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=df58fb431aa3b8371e11b27a94b20f8b765799c7



--------------------------------

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 1f09af06 ("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 02aff859 ("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: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarWeilong Chen <chenweilong@huawei.com>

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 2129fbd3

scripts/lld-version.sh

+26 −9
Original line number Diff line number Diff line
@@ -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