From: Colin Cross <ccross@android.com>
Date: Fri, 25 Sep 2015 01:07:52 +0000 (+0000)
Subject: Merge "Revert "disable Krait for Mac builds to avoid assembler issues""
X-Git-Tag: android-x86-7.1-r1~608^2~19^2~134^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c180dd0b;p=android-x86%2Fbuild.git

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

c180dd0bfc55ae222f143dc86a333caf000cbf03
diff --cc core/clang/arm.mk
index 6b3d7c17c,ceb4a5a03..e66aa6c94
--- a/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 :=