am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"

* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
  Add -mfpu=neon-vfpv4 if cpu is krait
This commit is contained in:
Stephen Hines
2015-08-15 02:12:46 +00:00
committed by Android Git Automerger

View File

@@ -7,7 +7,7 @@ CLANG_CONFIG_arm_EXTRA_CFLAGS :=
ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT))) ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
# Android's clang support's krait as a CPU whereas GCC doesn't. Specify # 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. # -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 endif
ifeq ($(HOST_OS),darwin) ifeq ($(HOST_OS),darwin)