am 09c6d68b: am 816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."

* commit '09c6d68b8879164f600bbe084a62cfbc4ab10850':
  Specify -mcpu=cortex-a15 for krait CPU variants.

diff --cc core/combo/arch/arm/armv7-a-neon.mk
index 057ce93,208c24c..1105330
--- 1/core/combo/arch/arm/armv7-a-neon.mk
--- 2/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@@ -6,12 -6,9 +6,12 @@@ ARCH_ARM_HAVE_VFP               := tru
  ARCH_ARM_HAVE_VFP_D32           := true
  ARCH_ARM_HAVE_NEON              := true
  
- ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
+ ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))
        arch_variant_cflags := -mcpu=cortex-a15
  else
 +ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8)
 +      arch_variant_cflags := -mcpu=cortex-a8
 +else
  ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)
        arch_variant_cflags := -mcpu=cortex-a7
  else