Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55acb92d authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am d263924f: am 69bd465b: Merge "Don\'t use -Wl,--fix-cortex-a8 for Cortex A7,... 

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

* commit 'd263924f':
  Don't use -Wl,--fix-cortex-a8 for Cortex A7, A9, A15, Krait or Denver
parents 948f67b0 d263924f

core/combo/arch/arm/armv7-a-neon.mk

+9 −3
Original line number Diff line number Diff line
@@ -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