kbuild: Unify options for BTF generation for vmlinux and modules

[mirror_ubuntu-jammy-kernel.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index d74cee5c4326a5833048ed99bee859fd7f1dcd0e..3ea7cece7c97d934821c63db5e7086bde3122460 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -205,7 +205,6 @@ vmlinux_link()
 gen_btf()
 {
        local pahole_ver
-       local extra_paholeopt=
 
        if ! [ -x "$(command -v ${PAHOLE})" ]; then
                echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
@@ -220,16 +219,8 @@ gen_btf()
 
        vmlinux_link ${1}
 
-       if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
-               # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars
-               extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars"
-       fi
-       if [ "${pahole_ver}" -ge "121" ]; then
-               extra_paholeopt="${extra_paholeopt} --btf_gen_floats"
-       fi
-
        info "BTF" ${2}
-       LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1}
+       LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
 
        # Create ${2} which contains just .BTF section but no symbols. Add
        # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all