diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-06 14:40:36 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-06 14:40:36 -0700 |
| commit | 017d16cb8fd2b1f1c8aadd326fca700ea7d043dc (patch) | |
| tree | 26cf799de71e10af1b3c2419b4d16244d793e73c /runtime/arch | |
| parent | 69958562959dbd772a1bac02e2838dbe79995d58 (diff) | |
| download | art-017d16cb8fd2b1f1c8aadd326fca700ea7d043dc.zip art-017d16cb8fd2b1f1c8aadd326fca700ea7d043dc.tar.gz art-017d16cb8fd2b1f1c8aadd326fca700ea7d043dc.tar.bz2 | |
ART: Make unknown variant "mips64r6" go away
It's the standard variant, accept it just like "default."
Change-Id: I9b600345e3e1ebfb508ffe22ddde17757be2172e
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/mips64/instruction_set_features_mips64.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/arch/mips64/instruction_set_features_mips64.cc b/runtime/arch/mips64/instruction_set_features_mips64.cc index 26478cb..8c48a08 100644 --- a/runtime/arch/mips64/instruction_set_features_mips64.cc +++ b/runtime/arch/mips64/instruction_set_features_mips64.cc @@ -26,8 +26,7 @@ namespace art { const Mips64InstructionSetFeatures* Mips64InstructionSetFeatures::FromVariant( const std::string& variant, std::string* error_msg ATTRIBUTE_UNUSED) { - // TODO: r6 variant. - if (variant != "default") { + if (variant != "default" && variant != "mips64r6") { std::ostringstream os; LOG(WARNING) << "Unexpected CPU variant for Mips64 using defaults: " << variant; } |