Add cortex-a9 to armv7-a-neon, allow specifying FPU.

Change-Id: I2527e8971cae62ddb35339ea0f5627ea46ee8239
OMAP4-AOSP · Sep 17, 2016 · ab5ece9 · ab5ece9
1 parent 2801151
commit ab5ece9
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
@@ -19,6 +19,11 @@ ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VA
 	arch_variant_ldflags := \
 		-Wl,--no-fix-cortex-a8
 else
+ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a9)
+	arch_variant_cflags := -mcpu=cortex-a9
+	arch_variant_ldflags := \
+		-Wl,--no-fix-cortex-a8
+else
 ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
 	arch_variant_cflags := -mcpu=cortex-a8
 	arch_variant_ldflags := \
@@ -38,6 +43,7 @@ else
 endif
 endif
 endif
+endif
 
 ifeq (true,$(local_arch_has_lpae))
 	# Fake an ARM compiler flag as these processors support LPAE which GCC/clang
@@ -50,5 +56,12 @@ endif
 local_arch_has_lpae :=
 
 arch_variant_cflags += \
-    -mfloat-abi=softfp \
-    -mfpu=neon
+	-mfloat-abi=softfp
+
+ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)FPU_VARIANT)),)
+arch_variant_cflags += \
+	-mfpu=neon
+else
+arch_variant_cflags += \
+	-mfpu=$(TARGET_$(combo_2nd_arch_prefix)FPU_VARIANT)
+endif