StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd263924fe4d1203e97787e123ddd951879945bdd':
  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:35:53 +00:00
committed by Android Git Automerger
parent 948f67b0e7 d263924fe4
commit 55acb92d82
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/combo/arch/arm/armv7-a-neon.mk
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 # Fake an ARM compiler flag as these processors support LPAE which GCC/clang
# don't advertise. # don't advertise.
arch_variant_cflags += -D__ARM_FEATURE_LPAE=1 arch_variant_cflags += -D__ARM_FEATURE_LPAE=1
arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8
else else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8) ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
arch_variant_cflags := -mcpu=cortex-a8 arch_variant_cflags := -mcpu=cortex-a8
arch_variant_ldflags := \
-Wl,--fix-cortex-a8
else else
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7) ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a7)
arch_variant_cflags := -mcpu=cortex-a7 arch_variant_cflags := -mcpu=cortex-a7
arch_variant_ldflags := \
-Wl,--no-fix-cortex-a8
else else
arch_variant_cflags := -march=armv7-a 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 endif
endif endif
@@ -31,6 +40,3 @@ endif
arch_variant_cflags += \ arch_variant_cflags += \
-mfloat-abi=softfp \ -mfloat-abi=softfp \
-mfpu=neon -mfpu=neon
arch_variant_ldflags := \
-Wl,--fix-cortex-a8