| commit | 39a5bba4726016b1d92c181cb464bfb0ffabab22 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Wed Dec 17 00:59:21 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 17 00:59:22 2014 +0000 |
| tree | 977e4e8c27bb65fc62b71f2d93cd5a8bd7bcbba1 | |
| parent | 73a730caf566fb778ad36f6d991666c482918d22 [diff] | |
| parent | 7c40fb95dc90ed092f435c769b4bbb494d453674 [diff] |
Merge "disable Krait for Mac builds to avoid assembler issues"
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 :=