aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/combo/arch/arm/armv7-a-neon.mk6
-rw-r--r--core/combo/arch/arm/armv7-a.mk6
2 files changed, 12 insertions, 0 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
index 7b5b8ed64f..17c422494f 100644
--- a/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@ -20,5 +20,11 @@ arch_variant_cflags := \
-mfloat-abi=softfp \
-mfpu=neon
+ifneq (,$(findstring cpu=cortex-a9,$(TARGET_EXTRA_CFLAGS)))
+# No need to work around Cortex A8 errata if we're targeting A9 only...
+arch_variant_ldflags := \
+ -Wl,--no-fix-cortex-a8
+else
arch_variant_ldflags := \
-Wl,--fix-cortex-a8
+endif
diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk
index 0ca3ec6c0b..293724a4a2 100644
--- a/core/combo/arch/arm/armv7-a.mk
+++ b/core/combo/arch/arm/armv7-a.mk
@@ -18,5 +18,11 @@ arch_variant_cflags := \
-mfloat-abi=softfp \
-mfpu=vfpv3-d16
+ifneq (,$(findstring cpu=cortex-a9,$(TARGET_EXTRA_CFLAGS)))
+# No need to work around Cortex A8 errata if we're targeting A9 only...
+arch_variant_ldflags := \
+ -Wl,--no-fix-cortex-a8
+else
arch_variant_ldflags := \
-Wl,--fix-cortex-a8
+endif