Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 618916a4 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

kbuild: replace BASH-specific ${@:2} with shift and ${@} 



${@:2} is BASH-specific extension, which makes link-vmlinux.sh rely on
BASH. Use shift and ${@} instead to fix this issue.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: 341dfcf8 ("btf: expose BTF info through sysfs")
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 1e46c09e

scripts/link-vmlinux.sh

+11 −5
Original line number Diff line number Diff line
@@ -57,12 +57,16 @@ modpost_link() 


# Link of vmlinux

# ${1} - output file

# ${@:2} - optional extra .o files

# ${2}, ${3}, ... - optional extra .o files

vmlinux_link()

{

	local lds="${objtree}/${KBUILD_LDS}"

	local output=${1}

	local objects



	# skip output file argument

	shift



	if [ "${SRCARCH}" != "um" ]; then

		objects="--whole-archive			\

			${KBUILD_VMLINUX_OBJS}			\
@@ -70,9 +74,10 @@ vmlinux_link() 
			--start-group				\

			${KBUILD_VMLINUX_LIBS}			\

			--end-group				\

			${@:2}"

			${@}"



		${LD} ${KBUILD_LDFLAGS} ${LDFLAGS_vmlinux} -o ${1}	\

		${LD} ${KBUILD_LDFLAGS} ${LDFLAGS_vmlinux}	\

			-o ${output}				\

			-T ${lds} ${objects}

	else

		objects="-Wl,--whole-archive			\
@@ -81,9 +86,10 @@ vmlinux_link() 
			-Wl,--start-group			\

			${KBUILD_VMLINUX_LIBS}			\

			-Wl,--end-group				\

			${@:2}"

			${@}"



		${CC} ${CFLAGS_vmlinux} -o ${1}			\

		${CC} ${CFLAGS_vmlinux}				\

			-o ${output}				\

			-Wl,-T,${lds}				\

			${objects}				\

			-lutil -lrt -lpthread