Index: lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
===================================================================
--- lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
+++ lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp
@@ -49,14 +49,9 @@
 
 MipsABIInfo MipsABIInfo::computeTargetABI(const Triple &TT, StringRef CPU,
                                           const MCTargetOptions &Options) {
-  if (Options.getABIName().startswith("o32"))
-    return MipsABIInfo::O32();
-  else if (Options.getABIName().startswith("n32"))
-    return MipsABIInfo::N32();
-  else if (Options.getABIName().startswith("n64"))
-    return MipsABIInfo::N64();
-  else if (!Options.getABIName().empty())
-    llvm_unreachable("Unknown ABI option for MIPS");
+  if (!Options.getABIName().empty())
+    llvm_unreachable(
+        "ABI name should be in triple. See Triple::getABIVariant()");
   else if (TT.getEnvironment() == Triple::ABI32 ||
            TT.getEnvironment() == Triple::GNUABI32)
     return MipsABIInfo::O32();