diff options
| author | Tim Murray <timmurray@google.com> | 2014-12-17 00:59:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-17 00:59:22 +0000 |
| commit | 39a5bba4726016b1d92c181cb464bfb0ffabab22 (patch) | |
| tree | 977e4e8c27bb65fc62b71f2d93cd5a8bd7bcbba1 | |
| parent | 73a730caf566fb778ad36f6d991666c482918d22 (diff) | |
| parent | 7c40fb95dc90ed092f435c769b4bbb494d453674 (diff) | |
| download | build-39a5bba4726016b1d92c181cb464bfb0ffabab22.zip build-39a5bba4726016b1d92c181cb464bfb0ffabab22.tar.gz build-39a5bba4726016b1d92c181cb464bfb0ffabab22.tar.bz2 | |
Merge "disable Krait for Mac builds to avoid assembler issues"
| -rw-r--r-- | core/clang/arm.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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 := |