commit fb9131bd25b5a90e49da5e0f44b23e106558e7e0
author Andreas Gampe <agampe@google.com> Mon Apr 06 21:44:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 06 21:44:51 2015 +0000
tree 26cf799de71e10af1b3c2419b4d16244d793e73c
parent 69958562959dbd772a1bac02e2838dbe79995d58
parent 017d16cb8fd2b1f1c8aadd326fca700ea7d043dc

Merge "ART: Make unknown variant "mips64r6" go away"

runtime/arch/mips64/instruction_set_features_mips64.cc

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 @@
 
 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;
   }