From: Christopher Ferris <cferris@google.com>
Date: Fri, 18 Sep 2015 01:49:27 +0000 (-0700)
Subject: Set mcpu targets based on cpu variant.
X-Git-Tag: android-x86-7.1-r1~608^2~19^2~129^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=561b4c1995853c3ea5b8df2b496a4bbbc411937a;p=android-x86%2Fbuild.git

Set mcpu targets based on cpu variant.

Make cortex-a53 and cortex-a53.a57 use cortex-a7.

Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2
---

diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
index 99f17aa6d..5dc1fecdd 100644
--- a/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@ -24,7 +24,7 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
 	arch_variant_ldflags := \
 		-Wl,--fix-cortex-a8
 else
-ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7)
+ifneq (,$(filter cortex-a7 cortex-a53 cortex-a53.a57,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
 	arch_variant_cflags := -mcpu=cortex-a7
 	arch_variant_ldflags := \
 		-Wl,--no-fix-cortex-a8