From e270873407ef32351458263d56504c6ff0c0f5eb Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Tue, 28 Oct 2014 15:50:02 -0700 Subject: [PATCH] Specify -mcpu=krait for clang. Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a --- core/clang/arm.mk | 6 ++++++ core/combo/arch/arm/armv7-a-neon.mk | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/clang/arm.mk b/core/clang/arm.mk index ca66986820..ceb4a5a038 100644 --- a/core/clang/arm.mk +++ b/core/clang/arm.mk @@ -4,6 +4,12 @@ CLANG_CONFIG_arm_EXTRA_ASFLAGS := CLANG_CONFIG_arm_EXTRA_CFLAGS := +ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT))) + # Android's clang support's krait as a CPU whereas GCC doesn't. Specify + # -mcpu here rather than the more normal core/combo/arch/arm/armv7-a-neon.mk. + CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait +endif + CLANG_CONFIG_arm_EXTRA_CPPFLAGS := CLANG_CONFIG_arm_EXTRA_LDFLAGS := diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 3f4c3917ec..d535afca68 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -9,7 +9,8 @@ ARCH_ARM_HAVE_NEON := true ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT))) # TODO: krait is not a cortex-a15, we set the variant to cortex-a15 so that # hardware divide operations are generated. This should be removed and a - # krait CPU variant added to GCC/clang. + # krait CPU variant added to GCC. For clang we specify -mcpu for krait in + # core/clang/arm.mk. arch_variant_cflags := -mcpu=cortex-a15 # Fake an ARM compiler flag as these processors support LPAE which GCC/clang