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 44b7642082352791d664fbcab6ca12c7e54c570a..d7f4472c55e3fcee84a84f8a5bc67b5577da0322 100644 (file)
--- 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