From: Nick Alcock <nick.alcock@oracle.com>
Date: Mon, 24 Sep 2012 11:05:09 +0000 (+0100)
Subject: ctf: do not construct objects.builtin if CTF is not being built
X-Git-Tag: v4.1.12-92~313^2~116
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=54cb88e0b3adb8fe3dba897d033ae5fc38334acb;p=users%2Fjedix%2Flinux-maple.git

ctf: do not construct objects.builtin if CTF is not being built

This file is used only for the dwarf2ctf run inside Makefile.modpost.  That run
is conditionalized on CONFIG_DT_DISABLE_CTF, so objects.builtin should be
conditionalized on that too.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---

diff --git a/Makefile b/Makefile
index f6325c35d187..cafabb525ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -1103,6 +1103,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin objects
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
 
 ifdef CONFIG_DTRACE
+ifndef CONFIG_DT_DISABLE_CTF
 # This contains all the object files that are unconditionally built into the
 # kernel, for consumption by dwarf2ctf in Makefile.modpost.
 # This is made doubly annoying by the presence of '.o' files which are actually
@@ -1118,6 +1119,10 @@ else
 PHONY += objects.builtin
 objects.builtin:
 endif
+else
+PHONY += objects.builtin
+objects.builtin:
+endif
 
 # Target to prepare building external modules
 PHONY += modules_prepare