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

diff --cc core/clang/arm.mk
index 6b3d7c1,ceb4a5a..e66aa6c
--- 1/core/clang/arm.mk
--- 2/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@@ -7,14 -7,9 +7,9 @@@ CLANG_CONFIG_arm_EXTRA_CFLAGS :
  ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
    # Android's clang support's krait as a CPU whereas GCC doesn't. Specify
    # -mcpu here rather than the more normal core/combo/arch/arm/armv7-a-neon.mk.
 -  CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait
 +  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 :=