From 7c40fb95dc90ed092f435c769b4bbb494d453674 Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Tue, 9 Dec 2014 14:28:57 -0800
Subject: [PATCH] disable Krait for Mac builds to avoid assembler issues

Change-Id: Ie98f4dbc2cef92798ec08b43b93e7e0339a92a92
---
 core/clang/arm.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/clang/arm.mk b/core/clang/arm.mk
index ceb4a5a03..f76a1825c 100644
--- a/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@ -10,6 +10,11 @@ ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
   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 :=
-- 
2.11.0