am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues""

* commit 'c180dd0bfc55ae222f143dc86a333caf000cbf03':
  Revert "disable Krait for Mac builds to avoid assembler issues"
This commit is contained in:
Colin Cross 2015-09-25 01:11:48 +00:00 committed by Android Git Automerger
commit 45b0c8f163
1 changed files with 0 additions and 5 deletions

View File

@ -10,11 +10,6 @@ ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait -mfpu=neon-vfpv4
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 :=