ANDROID: arm64: kbuild: only specify code model with LTO for

 modules

This fixes CONFIG_LTO_CLANG for LLVM >= r334571 where LLVMgold actually
started respecting the code model flag.

Bug: 116819139
Bug: 119418330
Test: builds with LLVM r334571, boots on a device, all modules load
Change-Id: I1af9d24ed1b789a40ac1e85bd00e176ff8a68aa5
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Miguel de Dios <migueldedios@google.com>

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index b5457220641316c0e75df4b4715f94ef05676944..b0f0f607c47998e7fec71bb1f9fbfe3331c7f1af 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -104,7 +104,7 @@ ifeq ($(CONFIG_ARM64_MODULE_CMODEL_LARGE), y)
 KBUILD_CFLAGS_MODULE   += -mcmodel=large
 ifeq ($(CONFIG_LTO_CLANG), y)
 # Code model is not stored in LLVM IR, so we need to pass it also to LLVMgold
-LDFLAGS                += -plugin-opt=-code-model=large
+KBUILD_LDFLAGS_MODULE  += -plugin-opt=-code-model=large
 endif
 endif