summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-02-16 19:03:02 -0800
committerSteve Kondik <shade@chemlab.org>2013-02-16 20:16:32 -0800
commit90e13bc8a703d1f7807cee7b1d11f399e8d494b4 (patch)
tree5977e73acfe963162999e796c0df52810e727e28
parentc408754c8595055c60f3c0809e2448d7eaffabb3 (diff)
downloadbuild-90e13bc8a703d1f7807cee7b1d11f399e8d494b4.zip
build-90e13bc8a703d1f7807cee7b1d11f399e8d494b4.tar.gz
build-90e13bc8a703d1f7807cee7b1d11f399e8d494b4.tar.bz2
build: Relax Cortex CFLAGS
* Always set march=armv7-a * Use mtune instead of mcpu. Bad code is generated on A15 otherwise. Change-Id: Idf8ced8eb0e9d3d4676ca8ec69bf56aed5533bf4
-rw-r--r--core/combo/arch/arm/armv7-a.mk21
1 files changed, 4 insertions, 17 deletions
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)),)