bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()

[linux-2.6-microblaze.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index f4de4c9..36ef7b3 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -38,9 +38,7 @@ LDFLAGS_vmlinux="$3"
 # Will be supressed by "make -s"
 info()
 {
-       if [ "${quiet}" != "silent_" ]; then
-               printf "  %-7s %s\n" "${1}" "${2}"
-       fi
+       printf "  %-7s %s\n" "${1}" "${2}"
 }
 
 # Generate a linker script to ensure correct ordering of initcalls.
@@ -235,12 +233,16 @@ 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 ${extra_paholeopt} ${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