commit 7c40fb95dc90ed092f435c769b4bbb494d453674
author Tim Murray <timmurray@google.com> Tue Dec 09 14:28:57 2014 -0800
committer Tim Murray <timmurray@google.com> Tue Dec 09 14:28:57 2014 -0800
tree a8ba9feee19692552c4dedb889b6ffa4818479cd
parent e98755f9d6619ff141d099f9da655d141da72b8e

disable Krait for Mac builds to avoid assembler issues

Change-Id: Ie98f4dbc2cef92798ec08b43b93e7e0339a92a92

core/clang/arm.mk

diff --git a/core/clang/arm.mk b/core/clang/arm.mk
index ceb4a5a..f76a182 100644
--- a/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@ -10,6 +10,11 @@
   CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait
 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 :=