p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 

* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
This commit is contained in:
Ian Rogers 2014-10-29 12:32:37 +00:00 committed by Android Git Automerger
parent acd65c7db0 93cb8c7d95
commit 508e27bfd7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/clang/arm.mk
View File

@ -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 :=

3
core/combo/arch/arm/armv7-a-neon.mk
View File

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