commit c180dd0bfc55ae222f143dc86a333caf000cbf03
author Colin Cross <ccross@android.com> Fri Sep 25 01:07:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 25 01:07:52 2015 +0000
tree cc4a23b4030ce81a0edea20e453e1db5661b0dcf
parent fdec88c9726687f98448ccff7670bc843f77bf66
parent 737cc70b500b0ad05f96308921b066e57bdea40c

Merge "Revert "disable Krait for Mac builds to avoid assembler issues""

core/clang/arm.mk

diff --git a/core/clang/arm.mk b/core/clang/arm.mk
index 6b3d7c1..e66aa6c 100644
--- a/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@ -10,11 +10,6 @@
   CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait -mfpu=neon-vfpv4
 endif
 
-ifeq ($(HOST_OS),darwin)
-  # Darwin is really bad at dealing with idiv/sdiv. Don't use krait on Darwin.
-  CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=cortex-a9
-endif
-
 CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=
 
 CLANG_CONFIG_arm_EXTRA_LDFLAGS :=