diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-17 03:56:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-17 03:56:42 +0000 |
| commit | fc82be6e776acfc3d784e61e2026d65417285495 (patch) | |
| tree | 3e99f1ab8b7d8f65a3275da3eac70e9c6f1a9e61 | |
| parent | 4e3e9ffbf314500d303724aefbddf1b89094cfd8 (diff) | |
| parent | 6825e3c9db837814f10cf6642df9e937b3990cfc (diff) | |
| download | build-fc82be6e776acfc3d784e61e2026d65417285495.tar.gz | |
Merge "Add LPAE to dex2oat ISA feature list."
| -rw-r--r-- | core/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.mk b/core/config.mk index d0743f4677..4d4fa4f3c4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -533,7 +533,7 @@ DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) 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_ARCH := $(TARGET_2ND_ARCH) $(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 |