summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2013-03-25 19:42:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-25 19:42:45 +0000
commit47e27a4f9ca67facd6501bf24314e6e02117b0d4 (patch)
tree0800a67aace2beee539131b3ff12cf93e5c9c538 /core
parentb2c7917463dc898b0b361229ed3345c23ac51d83 (diff)
parentbdbd716eff73e3033e9c3c85aa8cb988158dc070 (diff)
downloadbuild-47e27a4f9ca67facd6501bf24314e6e02117b0d4.zip
build-47e27a4f9ca67facd6501bf24314e6e02117b0d4.tar.gz
build-47e27a4f9ca67facd6501bf24314e6e02117b0d4.tar.bz2
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
Diffstat (limited to 'core')
-rw-r--r--core/combo/arch/arm/armv7-a-neon.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
index a928fe1..f2c1ca7 100644
--- a/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@ -9,8 +9,12 @@ ARCH_ARM_HAVE_NEON := true
ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)
arch_variant_cflags := -mcpu=cortex-a15
else
+ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7)
+ arch_variant_cflags := -mcpu=cortex-a7
+else
arch_variant_cflags := -march=armv7-a
endif
+endif
arch_variant_cflags += \
-mfloat-abi=softfp \