kbuild: replace BASH-specific ${@:2} with shift and ${@} (618916a4) · Commits · 戴 / test

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

Stephen Rothwell <sfr@canb.auug.org.au> Fixes: ("btf: expose BTF info through sysfs") Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by:

Andrii Nakryiko <andriin@fb.com> Acked-by:

Yonghong Song <yhs@fb.com> Reviewed-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by:

Alexei Starovoitov <ast@kernel.org>

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

Admin message