From 017d16cb8fd2b1f1c8aadd326fca700ea7d043dc Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 6 Apr 2015 14:40:36 -0700 Subject: ART: Make unknown variant "mips64r6" go away It's the standard variant, accept it just like "default." Change-Id: I9b600345e3e1ebfb508ffe22ddde17757be2172e --- runtime/arch/mips64/instruction_set_features_mips64.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/arch') 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; } -- cgit v1.1