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

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

Browse Source 
am: f948dddfe0

* commit 'f948dddfe085554b6dbdd0271170d53c09bbb7cd':
  Remove -mcpu=cortex-a15 when adding -mcpu=krait

Change-Id: Iff13b081842522217be92ca9fdf725a6a793412a
This commit is contained in:
Dan Willemsen
2016-05-09 22:55:33 +00:00
committed by android-build-merger
parent c0bf8c16ca f948dddfe0
commit 129ab6e97b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/clang/arm.mk
View File

@@ -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,\