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

Commit f948dddf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait"

parents 136fa437 aeadf41e

core/clang/arm.mk

+9 −6
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 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 -mfpu=neon-vfpv4

endif



CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=



CLANG_CONFIG_arm_EXTRA_LDFLAGS :=
@@ -31,6 +25,15 @@ CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \ 
  -fno-tree-copy-prop \

  -fno-tree-loop-optimize



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 -mfpu=neon-vfpv4



  # This isn't really unknown, but allows us to only set -mcpu=krait

  CLANG_CONFIG_arm_UNKNOWN_CFLAGS += -mcpu=cortex-a15

endif



define subst-clang-incompatible-arm-flags

  $(subst -march=armv5te,-march=armv5t,\

  $(subst -march=armv5e,-march=armv5,\