aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-01-21 16:57:09 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 17:21:18 -0500
commit310f8243a602e9ae950e81b17cbd18a4246674f9 (patch)
treeeca73a95b8ef4143dfada6b5f8290d4feee6bc30
parent91341d4b2c196c689acf90e9e96f28f8d5c6665f (diff)
kbuild: link vmlinux.o before kallsyms passes
link vmlinux.o so we may report section mismatch bugs before we start with the real link - that may error out. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8533f258c0e4..0f84c742ed0e 100644
--- a/Makefile
+++ b/Makefile
@@ -798,7 +798,7 @@ define rule_vmlinux-modpost
798endef 798endef
799 799
800# vmlinux image - including updated kernel symbols 800# vmlinux image - including updated kernel symbols
801vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE 801vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
802ifdef CONFIG_HEADERS_CHECK 802ifdef CONFIG_HEADERS_CHECK
803 $(Q)$(MAKE) -f $(srctree)/Makefile headers_check 803 $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
804endif 804endif
@@ -809,7 +809,9 @@ endif
809 $(call if_changed_rule,vmlinux__) 809 $(call if_changed_rule,vmlinux__)
810 $(Q)rm -f .old_version 810 $(Q)rm -f .old_version
811 811
812vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE 812# build vmlinux.o first to catch section mismatch errors early
813$(kallsyms.o): vmlinux.o
814vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE
813 $(call if_changed_rule,vmlinux-modpost) 815 $(call if_changed_rule,vmlinux-modpost)
814 816
815# The actual objects are generated when descending, 817# The actual objects are generated when descending,