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

Commit 62d947bf authored by Ben Cheng's avatar Ben Cheng Committed by Android (Google) Code Review
Browse files

Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."

parents 2ce71aa0 533aa270

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

+7 −5
Original line number Diff line number Diff line
@@ -13,11 +13,13 @@ ARCH_ARM_HAVE_VFP := true 
ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true



# Note: Hard coding the 'tune' value here is probably not ideal,

# and a better solution should be found in the future.

#

arch_variant_cflags := \

    -march=armv7-a \

ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15)

	arch_variant_cflags := -mcpu=cortex-a15

else

	arch_variant_cflags := -march=armv7-a

endif



arch_variant_cflags += \

    -mfloat-abi=softfp \

    -mfpu=neon

core/llvm_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ $(call clang-flags-subst,-march=armv5e,-march=armv5) 
$(call clang-flags-subst,-Wno-psabi,)

$(call clang-flags-subst,-Wno-unused-but-set-variable,)



# clang does not support -mcpu=cortex-a15 yet - fall back to armv7-a for now

$(call clang-flags-subst,-mcpu=cortex-a15,-march=armv7-a)



ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -faddress-sanitizer

ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit

ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl libasan_preload