diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-29 12:32:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 12:32:37 +0000 |
| commit | 508e27bfd7f470a945978c2b24403b0827dcde18 (patch) | |
| tree | 0e8ebac812efc79b2b2faa87cdee84ccb26dcf88 /core/clang | |
| parent | acd65c7db0212bff2b7b1878a26b7a105522cd44 (diff) | |
| parent | 93cb8c7d951b89eeb1e3cee2433bffecc13fdb11 (diff) | |
| download | build-508e27bfd7f470a945978c2b24403b0827dcde18.zip build-508e27bfd7f470a945978c2b24403b0827dcde18.tar.gz build-508e27bfd7f470a945978c2b24403b0827dcde18.tar.bz2 | |
am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
Specify -mcpu=krait for clang.
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/arm.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/clang/arm.mk b/core/clang/arm.mk index ca66986..ceb4a5a 100644 --- a/core/clang/arm.mk +++ b/core/clang/arm.mk @@ -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 := |