summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-02-07 10:40:37 -0800
committerYing Wang <wangying@google.com>2014-02-07 10:44:10 -0800
commitde9955c35ec9b3dee26ceffdf120136380dd2a56 (patch)
tree740b9569a14e0bee7c4d65e9b8abef09f18ed495 /core
parent737a51dd7294b0443b4f1ac55372310d635c5121 (diff)
downloadbuild-de9955c35ec9b3dee26ceffdf120136380dd2a56.zip
build-de9955c35ec9b3dee26ceffdf120136380dd2a56.tar.gz
build-de9955c35ec9b3dee26ceffdf120136380dd2a56.tar.bz2
Select the arch_variant_cflags for the 2nd arch.
Change-Id: Id2f9d7073a4aae3ba0fe5e5464045761f4d42b4e
Diffstat (limited to 'core')
-rw-r--r--core/combo/arch/arm/armv7-a-neon.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
index 1105330..a021258 100644
--- a/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@ -6,13 +6,13 @@ ARCH_ARM_HAVE_VFP := true
ARCH_ARM_HAVE_VFP_D32 := true
ARCH_ARM_HAVE_NEON := true
-ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait))
+ifneq (,$(filter cortex-a15 krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
arch_variant_cflags := -mcpu=cortex-a15
else
-ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8)
+ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
arch_variant_cflags := -mcpu=cortex-a8
else
-ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)
+ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7)
arch_variant_cflags := -mcpu=cortex-a7
else
arch_variant_cflags := -march=armv7-a