blob: bc09112ba73e4f34a67e5c9d544727086261ed77 [file] [log] [blame]
From 2b418f3c3228828812fbf4096fd3bb294c88ab56 Mon Sep 17 00:00:00 2001
From: Sasha Levin <sashal@kernel.org>
Date: Fri, 4 Oct 2019 14:08:13 +0100
Subject: arm64: Default to building compat vDSO with clang when
CONFIG_CC_IS_CLANG
From: Will Deacon <will@kernel.org>
[ Upstream commit 24ee01a927bfe56c66429ec4b1df6955a814adc8 ]
Rather than force the use of GCC for the compat cross-compiler, instead
extract the target from CROSS_COMPILE_COMPAT and pass it to clang if the
main compiler is clang.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm64/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 9743b50bdee7d..5858d6e449268 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -47,7 +47,11 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable)
endif
endif
+ifeq ($(CONFIG_CC_IS_CLANG), y)
+COMPATCC ?= $(CC) --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))
+else
COMPATCC ?= $(CROSS_COMPILE_COMPAT)gcc
+endif
export COMPATCC
ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y)
--
2.20.1