From 9a8ab56fac64d77ec2fbdfd8bec1e9ba1d04c6a6 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Wed, 19 Feb 2014 15:55:21 +0000 Subject: [PATCH] [mips] Use llvm::Triple in ParseMipsTriple() instead of manually parsing it No functional change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201689 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Mips/MCTargetDesc/MipsMCTargetDesc.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp index 70b5ba79cf3..01bdfb704f6 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp @@ -15,6 +15,7 @@ #include "InstPrinter/MipsInstPrinter.h" #include "MipsMCAsmInfo.h" #include "MipsTargetStreamer.h" +#include "llvm/ADT/Triple.h" #include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCELFStreamer.h" #include "llvm/MC/MCInstrInfo.h" @@ -40,21 +41,10 @@ using namespace llvm; static std::string ParseMipsTriple(StringRef TT, StringRef CPU) { std::string MipsArchFeature; - size_t DashPosition = 0; - StringRef TheTriple; + Triple TheTriple(TT); - // Let's see if there is a dash, like mips-unknown-linux. - DashPosition = TT.find('-'); - - if (DashPosition == StringRef::npos) { - // No dash, we check the string size. - TheTriple = TT.substr(0); - } else { - // We are only interested in substring before dash. - TheTriple = TT.substr(0,DashPosition); - } - - if (TheTriple == "mips" || TheTriple == "mipsel") { + if (TheTriple.getArch() == Triple::mips || + TheTriple.getArch() == Triple::mipsel) { if (CPU.empty() || CPU == "mips32") { MipsArchFeature = "+mips32"; } else if (CPU == "mips32r2") {