diff options
| -rw-r--r-- | runtime/Android.mk | 4 | ||||
| -rw-r--r-- | runtime/arch/arm64/instruction_set_features_arm64.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 8ced4d9d61..25fe45f5cd 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -344,7 +344,7 @@ LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default ifeq ($(DEX2OAT_TARGET_ARCH),arm) ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := lpae,div + LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div else ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div @@ -353,7 +353,7 @@ ifeq ($(DEX2OAT_TARGET_ARCH),arm) endif ifeq ($(2ND_DEX2OAT_TARGET_ARCH),arm) ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := lpae,div + 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div else ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index 18536ed6d6..696dd94e58 100644 --- a/runtime/arch/arm64/instruction_set_features_arm64.cc +++ b/runtime/arch/arm64/instruction_set_features_arm64.cc @@ -26,7 +26,7 @@ namespace art { const Arm64InstructionSetFeatures* Arm64InstructionSetFeatures::FromVariant( const std::string& variant ATTRIBUTE_UNUSED, std::string* error_msg ATTRIBUTE_UNUSED) { - if (variant != "default") { + if (variant != "default" && variant != "generic") { std::ostringstream os; os << "Unexpected CPU variant for Arm64: " << variant; *error_msg = os.str(); |