| commit | b3ad3943f363ab7c60d17125ac871e31c25b8a7a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Dec 17 01:08:01 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 17 01:08:02 2014 +0000 |
| tree | 9b60d55bafa8c6da4a920d3af0dcf7c4a52e4cef | |
| parent | 39a5bba4726016b1d92c181cb464bfb0ffabab22 [diff] | |
| parent | 01bf7931ebd2c9d8923e031904a33b7b71c9f028 [diff] |
Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
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 :=