commit e270873407ef32351458263d56504c6ff0c0f5eb
author Ian Rogers <irogers@google.com> Tue Oct 28 15:50:02 2014 -0700
committer Ian Rogers <irogers@google.com> Tue Oct 28 15:50:02 2014 -0700
tree b0e5d2880188af0dff88691ec2bae9a20f8d9baa
parent 97ef1d46cdae3776e49900b2ed92748f6127bbb0

Specify -mcpu=krait for clang.

Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a

core/clang/arm.mk

diff --git a/core/clang/arm.mk b/core/clang/arm.mk
index ca66986..ceb4a5a 100644
--- a/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@ -4,6 +4,12 @@
 
 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 :=