diff options
author | Sam Ravnborg <sam@uranus.ravnborg.org> | 2008-05-01 13:31:35 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@uranus.ravnborg.org> | 2008-05-01 13:31:35 -0400 |
commit | 90ebd878a5900839106664fae40a6cc83dbe86ab (patch) | |
tree | 90f4d11d1ffa004d4e7c56b06ff7074f85ca20c9 /Makefile | |
parent | b44158de9e318fbc92ac6c665ad3d0c948e80ac3 (diff) |
kbuild: fix vmlinux.o link
We always linked vmliux.o.
Remove init/built-in.o dependency so we avoid this
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -794,7 +794,7 @@ endif # ifdef CONFIG_KALLSYMS | |||
794 | quiet_cmd_vmlinux-modpost = LD $@ | 794 | quiet_cmd_vmlinux-modpost = LD $@ |
795 | cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ | 795 | cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ |
796 | $(vmlinux-init) --start-group $(vmlinux-main) --end-group \ | 796 | $(vmlinux-init) --start-group $(vmlinux-main) --end-group \ |
797 | $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^) | 797 | $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^) |
798 | define rule_vmlinux-modpost | 798 | define rule_vmlinux-modpost |
799 | : | 799 | : |
800 | +$(call cmd,vmlinux-modpost) | 800 | +$(call cmd,vmlinux-modpost) |
@@ -818,7 +818,9 @@ endif | |||
818 | ifdef CONFIG_KALLSYMS | 818 | ifdef CONFIG_KALLSYMS |
819 | .tmp_vmlinux1: vmlinux.o | 819 | .tmp_vmlinux1: vmlinux.o |
820 | endif | 820 | endif |
821 | vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE | 821 | |
822 | modpost-init := $(filter-out init/built-in.o, $(vmlinux-init)) | ||
823 | vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE | ||
822 | $(call if_changed_rule,vmlinux-modpost) | 824 | $(call if_changed_rule,vmlinux-modpost) |
823 | 825 | ||
824 | # The actual objects are generated when descending, | 826 | # The actual objects are generated when descending, |