summaryrefslogtreecommitdiffstats
path: root/core/clang/arm.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-28 15:50:02 -0700
committerIan Rogers <irogers@google.com>2014-10-28 15:50:02 -0700
commite270873407ef32351458263d56504c6ff0c0f5eb (patch)
treeb0e5d2880188af0dff88691ec2bae9a20f8d9baa /core/clang/arm.mk
parent97ef1d46cdae3776e49900b2ed92748f6127bbb0 (diff)
downloadbuild-e270873407ef32351458263d56504c6ff0c0f5eb.zip
build-e270873407ef32351458263d56504c6ff0c0f5eb.tar.gz
build-e270873407ef32351458263d56504c6ff0c0f5eb.tar.bz2
Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
Diffstat (limited to 'core/clang/arm.mk')
-rw-r--r--core/clang/arm.mk6
1 files changed, 6 insertions, 0 deletions
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_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 :=