From 4aaef9265abacea3edb8b72777b4272be87cf6e0 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 1 May 2008 19:31:35 +0200 Subject: [PATCH] --- yaml --- r: 95740 b: refs/heads/master c: 90ebd878a5900839106664fae40a6cc83dbe86ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 829240611b7f..7915a61f8e3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b44158de9e318fbc92ac6c665ad3d0c948e80ac3 +refs/heads/master: 90ebd878a5900839106664fae40a6cc83dbe86ab diff --git a/trunk/Makefile b/trunk/Makefile index d3634cd6fe35..5cf825819533 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -794,7 +794,7 @@ endif # ifdef CONFIG_KALLSYMS quiet_cmd_vmlinux-modpost = LD $@ cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ $(vmlinux-init) --start-group $(vmlinux-main) --end-group \ - $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^) + $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^) define rule_vmlinux-modpost : +$(call cmd,vmlinux-modpost) @@ -818,7 +818,9 @@ endif ifdef CONFIG_KALLSYMS .tmp_vmlinux1: vmlinux.o endif -vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE + +modpost-init := $(filter-out init/built-in.o, $(vmlinux-init)) +vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE $(call if_changed_rule,vmlinux-modpost) # The actual objects are generated when descending,