Commit-ID:  35e76b99ddf20405a6196bb7c9eb152675c93106
Gitweb:     https://git.kernel.org/tip/35e76b99ddf20405a6196bb7c9eb152675c93106
Author:     Nadav Amit <na...@vmware.com>
AuthorDate: Wed, 3 Oct 2018 14:30:51 -0700
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Thu, 4 Oct 2018 10:05:38 +0200

kbuild/arch/xtensa: Define LINKER_SCRIPT for the linker script

Define the LINKER_SCRIPT when building the linker script as being done
in other architectures. This is required, because upcoming Makefile changes
would otherwise break things.

Signed-off-by: Nadav Amit <na...@vmware.com>
Acked-by: Max Filippov <jcmvb...@gmail.com>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Chris Zankel <ch...@zankel.net>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masah...@socionext.com>
Cc: Michal Marek <michal.l...@markovi.net>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: linux-xte...@linux-xtensa.org
Link: http://lkml.kernel.org/r/20181003213100.189959-2-na...@vmware.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/xtensa/kernel/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index 91907590d183..8dff506caf07 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -35,8 +35,8 @@ sed-y = -e ':a; 
s/\*(\([^)]*\)\.text\.unlikely/*(\1.literal.unlikely .{text}.unl
        -e 's/\.{text}/.text/g'
 
 quiet_cmd__cpp_lds_S = LDS     $@
-cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ $<    \
-                 | sed $(sed-y) >$@
+cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ \
+                -DLINKER_SCRIPT $< | sed $(sed-y) >$@
 
 $(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE
        $(call if_changed_dep,_cpp_lds_S)

Reply via email to