am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"

* commit '39a5bba4726016b1d92c181cb464bfb0ffabab22':
  disable Krait for Mac builds to avoid assembler issues
This commit is contained in:
Tim Murray 2014-12-17 01:13:09 +00:00 committed by Android Git Automerger
commit 1d693cecc6

View file

@ -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 :=