From: Jerry Snitselaar <jerry.snitselaar@oracle.com>
Date: Thu, 31 Oct 2013 03:03:21 +0000 (-0700)
Subject: kbuild: Set objects.builtin dependency to bzImage for CONFIG_CTF
X-Git-Tag: v4.1.12-92~221^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=31c972eebd81f731e91e687fd7038ffdb1423336;p=users%2Fjedix%2Flinux-maple.git

kbuild: Set objects.builtin dependency to bzImage for CONFIG_CTF

For x86 architecture use dependency on bzImage target instead of
vmlinux, otherwise the linux_banner in the debug vmlinux and the
vmlinuz that is shipped are different because vmlinux is now getting
rebuilt for ctf.

Orabug: 17510915
Orabug: 22329011

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
Reviewed-by: Nick Alcock <nick.alcock@oracle.com>
---

diff --git a/Makefile b/Makefile
index 44b764208235..d7f4472c55e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1111,7 +1111,11 @@ KBUILD_BUILTIN := 1
 # kernel, for consumption by dwarf2ctf in Makefile.modpost.
 # This is made doubly annoying by the presence of '.o' files which are actually
 # empty ar archives.
+ifeq ($(SRCARCH),x86)
+objects.builtin: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),bzImage) FORCE
+else
 objects.builtin: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) FORCE
+endif
 	@echo $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) | \
 		tr " " "\n" | grep "\.o$$" | xargs file | \
 		grep ELF | cut -d: -f1 > objects.builtin