Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

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

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 436379940356130eb1cd4b2a20ded511e4a8b4c8..bbe9be2bf5ff12c62f58243f16079d25778f5145 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -108,13 +108,13 @@ gen_btf()
        local bin_arch
 
        if ! [ -x "$(command -v ${PAHOLE})" ]; then
-               info "BTF" "${1}: pahole (${PAHOLE}) is not available"
+               echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available"
                return 1
        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"
+               echo >&2 "BTF: ${1}: pahole version $(${PAHOLE} --version) is too old, need at least v1.13"
                return 1
        fi
 
@@ -180,9 +180,9 @@ mksysmap()
        ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
 }
 
-sortextable()
+sorttable()
 {
-       ${objtree}/scripts/sortextable ${1}
+       ${objtree}/scripts/sorttable ${1}
 }
 
 # Delete output files in case of error
@@ -304,9 +304,12 @@ fi
 
 vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
 
-if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
-       info SORTEX vmlinux
-       sortextable vmlinux
+if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
+       info SORTTAB vmlinux
+       if ! sorttable vmlinux; then
+               echo >&2 Failed to sort kernel tables
+               exit 1
+       fi
 fi
 
 info SYSMAP System.map