Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index dc0e8c5a140239c6a3bb13ccfbca5ab522328a28..a7124f895b2454179827ccdc7850bdb48aae1085 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -35,7 +35,7 @@ set -e
 info()
 {
        if [ "${quiet}" != "silent_" ]; then
-               printf "  %-7s %s\n" ${1} ${2}
+               printf "  %-7s %s\n" "${1}" "${2}"
        fi
 }
 
@@ -91,6 +91,25 @@ vmlinux_link()
        fi
 }
 
+# generate .BTF typeinfo from DWARF debuginfo
+gen_btf()
+{
+       local pahole_ver;
+
+       if ! [ -x "$(command -v ${PAHOLE})" ]; then
+               info "BTF" "${1}: pahole (${PAHOLE}) is not available"
+               return 0
+       fi
+
+       pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+       if [ "${pahole_ver}" -lt "113" ]; then
+               info "BTF" "${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13"
+               return 0
+       fi
+
+       info "BTF" ${1}
+       LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
+}
 
 # Create ${2} .o file with all symbols from the ${1} object file
 kallsyms()
@@ -193,6 +212,9 @@ modpost_link vmlinux.o
 # modpost vmlinux.o to check for section mismatches
 ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
 
+info MODINFO modules.builtin.modinfo
+${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo
+
 kallsymso=""
 kallsyms_vmlinux=""
 if [ -n "${CONFIG_KALLSYMS}" ]; then
@@ -248,6 +270,10 @@ fi
 info LD vmlinux
 vmlinux_link "${kallsymso}" vmlinux
 
+if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then
+       gen_btf vmlinux
+fi
+
 if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
        info SORTEX vmlinux
        sortextable vmlinux