am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver"

* commit '69bd465b6e14294ce0678e8a18d28eb55abbe2c7':
  Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
This commit is contained in:
Stephen Hines 2015-04-10 16:26:32 +00:00 committed by Android Git Automerger
commit d263924fe4
1 changed files with 9 additions and 3 deletions

View File

@ -16,14 +16,23 @@ ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VA
# Fake an ARM compiler flag as these processors support LPAE which GCC/clang
# don't advertise.
arch_variant_cflags += -D__ARM_FEATURE_LPAE=1
arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8
else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
arch_variant_cflags := -mcpu=cortex-a8
arch_variant_ldflags := \
-Wl,--fix-cortex-a8
else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7)
arch_variant_cflags := -mcpu=cortex-a7
arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8
else
arch_variant_cflags := -march=armv7-a
# Generic ARM might be a Cortex A8 -- better safe than sorry
arch_variant_ldflags := \
-Wl,--fix-cortex-a8
endif
endif
endif
@ -31,6 +40,3 @@ endif
arch_variant_cflags += \
-mfloat-abi=softfp \
-mfpu=neon
arch_variant_ldflags := \
-Wl,--fix-cortex-a8