commit 6825e3c9db837814f10cf6642df9e937b3990cfc
author Ian Rogers <irogers@google.com> Thu Oct 16 13:06:05 2014 -0700
committer Ian Rogers <irogers@google.com> Thu Oct 16 13:07:05 2014 -0700
tree b5be2196def7f7f02e71bc6ff96de274c9c519c8
parent 07b212ac59f0018a01ad3262caa0b96b9aff30a1

Add LPAE to dex2oat ISA feature list.

Bug: 17993736

Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d0743f4..4d4fa4f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -533,7 +533,7 @@
 DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)
 DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
 ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))
-  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
+  DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div
 endif
 
 ifdef TARGET_2ND_ARCH
@@ -541,7 +541,7 @@
 $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_2ND_CPU_VARIANT)
 $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
 ifneq (,$(filter $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))
-  $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
+  $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := lpae,div
 endif
 endif