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

Commit 93cb8c7d authored by Ian Rogers's avatar Ian Rogers Committed by Gerrit Code Review
Browse files

Merge "Specify -mcpu=krait for clang."

parents 97ef1d46 e2708734

core/clang/arm.mk

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ CLANG_CONFIG_arm_EXTRA_ASFLAGS := 


CLANG_CONFIG_arm_EXTRA_CFLAGS :=



ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))

  # Android's clang support's krait as a CPU whereas GCC doesn't. Specify

  # -mcpu here rather than the more normal core/combo/arch/arm/armv7-a-neon.mk.

  CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait

endif



CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=



CLANG_CONFIG_arm_EXTRA_LDFLAGS :=

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

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ ARCH_ARM_HAVE_NEON := true 
ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))

	# TODO: krait is not a cortex-a15, we set the variant to cortex-a15 so that

	#       hardware divide operations are generated. This should be removed and a

	#       krait CPU variant added to GCC/clang.

	#       krait CPU variant added to GCC. For clang we specify -mcpu for krait in

	#       core/clang/arm.mk.

	arch_variant_cflags := -mcpu=cortex-a15



	# Fake an ARM compiler flag as these processors support LPAE which GCC/clang