diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-16 20:13:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 20:13:05 +0000 |
| commit | 1bd593ca0be0aae779368f39b766824258fa1f1f (patch) | |
| tree | e94273b2d53597a636f11ddcb6852ddaedde2677 /core/combo | |
| parent | ad1891d1e932712f50d9b7485c09e8798a83e2a2 (diff) | |
| parent | defe864ab6f971efc00328cee5ea3cb1d69d377d (diff) | |
| download | build-1bd593ca0be0aae779368f39b766824258fa1f1f.zip build-1bd593ca0be0aae779368f39b766824258fa1f1f.tar.gz build-1bd593ca0be0aae779368f39b766824258fa1f1f.tar.bz2 | |
am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level."
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/arch/arm/armv7-a-neon.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index c6603db..3f4c391 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -7,7 +7,14 @@ ARCH_ARM_HAVE_VFP_D32 := true 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. arch_variant_cflags := -mcpu=cortex-a15 + + # Fake an ARM compiler flag as these processors support LPAE which GCC/clang + # don't advertise. + arch_variant_cflags += -D__ARM_FEATURE_LPAE=1 else ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8) arch_variant_cflags := -mcpu=cortex-a8 |