Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[platform/kernel/linux-starfive.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 408b5c0..bbe9be2 100755 (executable)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -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