diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:25:20 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:25:20 +0100 |
| commit | 882914410c98e48b6de5df0721164b963b55b63e (patch) | |
| tree | c17fe30cceac5b0f7b2dc39c84f4e0c1f44a5a5e /core/combo | |
| parent | 700d8f580e79ddc2f853cec8acc848706cbcbff5 (diff) | |
| parent | 078a4dc15aa20587d95a3ca6555721d9110b288e (diff) | |
| download | build-882914410c98e48b6de5df0721164b963b55b63e.zip build-882914410c98e48b6de5df0721164b963b55b63e.tar.gz build-882914410c98e48b6de5df0721164b963b55b63e.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/arch/arm/armv7-a-neon.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 9154f71..89e6573 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -27,7 +27,7 @@ ifneq (,$(filter cortex-a8 scorpion,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT arch_variant_ldflags := \ -Wl,--fix-cortex-a8 else -ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7) +ifneq (,$(filter cortex-a7 cortex-a53 cortex-a53.a57,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT))) arch_variant_cflags := -mcpu=cortex-a7 -mfpu=neon-vfpv4 arch_variant_ldflags := \ -Wl,--no-fix-cortex-a8 |