diff options
author | Daniel Sanders <daniel.sanders@imgtec.com> | 2015-06-15 10:34:38 +0000 |
---|---|---|
committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2015-06-15 10:34:38 +0000 |
commit | fa555dc7f868fc308c4bd5324e0590693d7bc41f (patch) | |
tree | cb2532c5a643b22088085ca299f47836aaf764ed /llvm/lib/Object/IRObjectFile.cpp | |
parent | 11c7522c5e1a268132913d6692de89f78bfb10e6 (diff) | |
download | bcm5719-llvm-fa555dc7f868fc308c4bd5324e0590693d7bc41f.tar.gz bcm5719-llvm-fa555dc7f868fc308c4bd5324e0590693d7bc41f.zip |
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
Diffstat (limited to 'llvm/lib/Object/IRObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/IRObjectFile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<Module> 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<MCRegisterInfo> MRI(T->createMCRegInfo(TT.str())); + std::unique_ptr<MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); if (!MRI) return; - std::unique_ptr<MCAsmInfo> MAI(T->createMCAsmInfo(*MRI, TT.str())); + std::unique_ptr<MCAsmInfo> MAI(T->createMCAsmInfo(*MRI, Triple)); if (!MAI) return; std::unique_ptr<MCSubtargetInfo> STI( - T->createMCSubtargetInfo(TT.str(), "", "")); + T->createMCSubtargetInfo(Triple, "", "")); if (!STI) return; @@ -70,7 +70,7 @@ IRObjectFile::IRObjectFile(MemoryBufferRef Object, std::unique_ptr<Module> 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<RecordStreamer> Streamer(new RecordStreamer(MCCtx)); T->createNullTargetStreamer(*Streamer); |