From fa555dc7f868fc308c4bd5324e0590693d7bc41f Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Mon, 15 Jun 2015 10:34:38 +0000 Subject: Revert r239721 - Replace string GNU Triples with llvm::Triple in InitMCObjectFileInfo. NFC. It appears to cause sparc-little-endian.s to assert on Windows and Darwin. llvm-svn: 239724 --- llvm/lib/Object/IRObjectFile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/lib/Object/IRObjectFile.cpp') diff --git a/llvm/lib/Object/IRObjectFile.cpp b/llvm/lib/Object/IRObjectFile.cpp index 36eb88cd115..b3d5db85ed5 100644 --- a/llvm/lib/Object/IRObjectFile.cpp +++ b/llvm/lib/Object/IRObjectFile.cpp @@ -45,22 +45,22 @@ IRObjectFile::IRObjectFile(MemoryBufferRef Object, std::unique_ptr Mod) if (InlineAsm.empty()) return; - Triple TT(M->getTargetTriple()); + StringRef Triple = M->getTargetTriple(); std::string Err; - const Target *T = TargetRegistry::lookupTarget(TT.str(), Err); + const Target *T = TargetRegistry::lookupTarget(Triple, Err); if (!T) return; - std::unique_ptr MRI(T->createMCRegInfo(TT.str())); + std::unique_ptr MRI(T->createMCRegInfo(Triple)); if (!MRI) return; - std::unique_ptr MAI(T->createMCAsmInfo(*MRI, TT.str())); + std::unique_ptr MAI(T->createMCAsmInfo(*MRI, Triple)); if (!MAI) return; std::unique_ptr STI( - T->createMCSubtargetInfo(TT.str(), "", "")); + T->createMCSubtargetInfo(Triple, "", "")); if (!STI) return; @@ -70,7 +70,7 @@ IRObjectFile::IRObjectFile(MemoryBufferRef Object, std::unique_ptr Mod) MCObjectFileInfo MOFI; MCContext MCCtx(MAI.get(), MRI.get(), &MOFI); - MOFI.InitMCObjectFileInfo(TT, Reloc::Default, CodeModel::Default, MCCtx); + MOFI.InitMCObjectFileInfo(Triple, Reloc::Default, CodeModel::Default, MCCtx); std::unique_ptr Streamer(new RecordStreamer(MCCtx)); T->createNullTargetStreamer(*Streamer); -- cgit v1.2.3