Merge branch 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

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

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 26c5b658c2d52ba1174c079b5eae3ddbc26f6996..cd9c6c6bb4c9d9dba4f9c80fc5edbb67170beef8 100644 (file)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -78,8 +78,8 @@ kallsyms()
                kallsymopt=--all-symbols
        fi
 
-       local aflags="${KBUILD_AFLAGS} ${NOSTDINC_FLAGS}                     \
-                     ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+       local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+                     ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
 
        ${NM} -n ${1} | \
                scripts/kallsyms ${kallsymopt} | \
@@ -93,6 +93,11 @@ mksysmap()
        ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
 }
 
+sortextable()
+{
+       ${objtree}/scripts/sortextable ${1}
+}
+
 # Delete output files in case of error
 trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
 cleanup()
@@ -192,6 +197,11 @@ fi
 info LD vmlinux
 vmlinux_link "${kallsymso}" vmlinux
 
+if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
+       info SORTEX vmlinux
+       sortextable vmlinux
+fi
+
 info SYSMAP System.map
 mksysmap vmlinux System.map