commit ed2783b8c674c0182e0773a0c476c540dc381d4e
author Ian Rogers <irogers@google.com> Fri Oct 17 07:44:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 17 07:44:14 2014 +0000
tree 64d7b3dc7ca7905f7e70d87a8be455af307c20a6
parent 6b607ce33d163f74016b9bc22208d3883c6f2324
parent 0251f3454e5f4716716673f2df1becd0730fbc79

am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."

* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
  Add LPAE to dex2oat ISA feature list.

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index bfa5610..3ceb392 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -552,7 +552,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
@@ -560,7 +560,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