diff options
| author | Ian Rogers <irogers@google.com> | 2013-10-11 17:35:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 17:35:09 -0700 |
| commit | b07a5f825795b45b01de6bb90f4c43ef1aae506a (patch) | |
| tree | 86d1b185edfe790f3006e20a0931da1d117a4c3e /core/combo/arch | |
| parent | 9512d6edf68d3fddc8a27e95886be68a4c554fbf (diff) | |
| parent | 09c6d68b8879164f600bbe084a62cfbc4ab10850 (diff) | |
| download | build-b07a5f825795b45b01de6bb90f4c43ef1aae506a.zip build-b07a5f825795b45b01de6bb90f4c43ef1aae506a.tar.gz build-b07a5f825795b45b01de6bb90f4c43ef1aae506a.tar.bz2 | |
am 09c6d68b: am 816af5fc: Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
* commit '09c6d68b8879164f600bbe084a62cfbc4ab10850':
Specify -mcpu=cortex-a15 for krait CPU variants.
Diffstat (limited to 'core/combo/arch')
| -rw-r--r-- | core/combo/arch/arm/armv7-a-neon.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 057ce93..1105330 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -6,7 +6,7 @@ ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true -ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15) +ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait)) arch_variant_cflags := -mcpu=cortex-a15 else ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8) |