am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."

* commit '0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
  Specify -mcpu=cortex-a15 for denver CPU variants.
This commit is contained in:
Christopher Ferris 2014-03-31 19:11:30 +00:00 committed by Android Git Automerger
commit 2d0ecc1b00

View file

@ -6,7 +6,7 @@ ARCH_ARM_HAVE_VFP := true
ARCH_ARM_HAVE_VFP_D32 := true
ARCH_ARM_HAVE_NEON := true
ifneq (,$(filter cortex-a15 krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
arch_variant_cflags := -mcpu=cortex-a15
else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)