From 90e13bc8a703d1f7807cee7b1d11f399e8d494b4 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Sat, 16 Feb 2013 19:03:02 -0800
Subject: build: Relax Cortex CFLAGS

 * Always set march=armv7-a
 * Use mtune instead of mcpu. Bad code is generated on A15 otherwise.

Change-Id: Idf8ced8eb0e9d3d4676ca8ec69bf56aed5533bf4
---
 core/combo/arch/arm/armv7-a.mk | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'core')

diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk
index ca6f2bb..a32ca6d 100644
--- a/core/combo/arch/arm/armv7-a.mk
+++ b/core/combo/arch/arm/armv7-a.mk
@@ -19,25 +19,12 @@ ARCH_ARM_HAVE_VFP_D32           := true
 ARCH_ARM_HAVE_NEON              := true
 endif
 
-mcpu-arg = $(shell sed 's/^-mcpu=//' <<< "$(call cc-option,-mcpu=$(1),-mcpu=$(2))")
-
-ifeq ($(TARGET_ARCH_VARIANT_CPU), cortex-a15)
-TARGET_ARCH_VARIANT_CPU := $(call mcpu-arg,cortex-a15,cortex-a9)
-endif
-ifeq ($(TARGET_ARCH_VARIANT_CPU), cortex-a9)
-TARGET_ARCH_VARIANT_CPU := $(call mcpu-arg,cortex-a9,cortex-a8)
-endif
-ifeq ($(TARGET_ARCH_VARIANT_CPU), cortex-a8)
-TARGET_ARCH_VARIANT_CPU := $(call mcpu-arg,cortex-a8,)
-endif
-
-ifneq ($(strip $(TARGET_ARCH_VARIANT_CPU)),)
-arch_variant_cflags := \
-    -mcpu=$(strip $(TARGET_ARCH_VARIANT_CPU))
-else
-# fall back on generic tunning if cpu is not specified
 arch_variant_cflags := \
     -march=armv7-a
+
+ifneq ($(strip $(TARGET_ARCH_VARIANT_CPU)),)
+arch_variant_cflags += \
+    -mtune=$(strip $(TARGET_ARCH_VARIANT_CPU))
 endif
 
 ifneq ($(strip $(TARGET_ARCH_VARIANT_FPU)),)
-- 
cgit v1.1