diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-13 19:10:33 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-13 19:12:07 -0800 |
| commit | 72a122c33dadde5661a39aaa0a10bc1dbff16ce6 (patch) | |
| tree | 1ab83f991429c6737f154ea1f371bb3f06e9f82e /runtime/arch | |
| parent | 0e57decfd5e56f12f42c9663f8e6147237b86039 (diff) | |
| download | art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.zip art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.tar.gz art-72a122c33dadde5661a39aaa0a10bc1dbff16ce6.tar.bz2 | |
ART: Fix last lpae occurrence, Arm64 generic
Fix the last occurrence of an lpae string in the default
instruction-set-feature strings (should be removed).
Allow "generic" Arm64 variant (same as "default").
Change-Id: I8bdd9fc7f596245e6541469664db01b3e781c51c
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/arm64/instruction_set_features_arm64.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/arm64/instruction_set_features_arm64.cc b/runtime/arch/arm64/instruction_set_features_arm64.cc index 18536ed..696dd94 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(); |