ELF: Split BitcodeCompiler::compile.

[ruiu]

Summary

ELF: Split BitcodeCompiler::compile.

ELF/LTO.h

 template <class ELFT> class ObjectFile;
 
 class BitcodeCompiler {
 public:
   void add(BitcodeFile &F);
   template <class ELFT> std::unique_ptr<ObjectFile<ELFT>> compile();
 
 private:
+  llvm::TargetMachine *getTargetMachine();
+
   llvm::LLVMContext Context;
   llvm::Module Combined{"ld-temp.o", Context};
   llvm::IRMover Mover{Combined};
   SmallString<0> OwningData;
   std::unique_ptr<MemoryBuffer> MB;
 };
 }
 }
 
 #endif

ELF/LTO.cpp

 
 // Merge all the bitcode files we have seen, codegen the result
 // and return the resulting ObjectFile.
 template <class ELFT>
 std::unique_ptr<elf::ObjectFile<ELFT>> BitcodeCompiler::compile() {
   if (Config->SaveTemps)
     saveBCFile(Combined, ".lto.bc");
 
-  StringRef TripleStr = Combined.getTargetTriple();
-  Triple TheTriple(TripleStr);
-
-  // FIXME: Should we have a default triple? The gold plugin uses
-  // sys::getDefaultTargetTriple(), but that is probably wrong given that this
-  // might be a cross linker.
-
-  std::string ErrMsg;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TripleStr, ErrMsg);
-  if (!TheTarget)
-    fatal("target not found: " + ErrMsg);
-
-  TargetOptions Options;
-  Reloc::Model R = Config->Pic ? Reloc::PIC_ : Reloc::Static;
-  std::unique_ptr<TargetMachine> TM(
-      TheTarget->createTargetMachine(TripleStr, "", "", Options, R));
-
+  std::unique_ptr<TargetMachine> TM(getTargetMachine());
   runLTOPasses(Combined, *TM);
 
   raw_svector_ostream OS(OwningData);
   legacy::PassManager CodeGenPasses;
   if (TM->addPassesToEmitFile(CodeGenPasses, OS,
                               TargetMachine::CGFT_ObjectFile))
     fatal("failed to setup codegen");
   CodeGenPasses.run(Combined);
   MB = MemoryBuffer::getMemBuffer(OwningData,
                                   "LLD-INTERNAL-combined-lto-object", false);
   if (Config->SaveTemps)
     saveLtoObjectFile(MB->getBuffer());
 
   std::unique_ptr<InputFile> IF = createObjectFile(*MB);
   auto *OF = cast<ObjectFile<ELFT>>(IF.release());
   return std::unique_ptr<ObjectFile<ELFT>>(OF);
 }
 
+TargetMachine *BitcodeCompiler::getTargetMachine() {
+  StringRef TripleStr = Combined.getTargetTriple();
+
+  // FIXME: Should we have a default triple? The gold plugin uses
+  // sys::getDefaultTargetTriple(), but that is probably wrong given that this
+  // might be a cross linker.
+  std::string Msg;
+  const Target *T = TargetRegistry::lookupTarget(TripleStr, Msg);
+  if (!T)
+    fatal("target not found: " + Msg);
+
+  TargetOptions Options;
+  Reloc::Model R = Config->Pic ? Reloc::PIC_ : Reloc::Static;
+  return T->createTargetMachine(TripleStr, "", "", Options, R);
+}
+
 template std::unique_ptr<elf::ObjectFile<ELF32LE>> BitcodeCompiler::compile();
 template std::unique_ptr<elf::ObjectFile<ELF32BE>> BitcodeCompiler::compile();
 template std::unique_ptr<elf::ObjectFile<ELF64LE>> BitcodeCompiler::compile();
 template std::unique_ptr<elf::ObjectFile<ELF64BE>> BitcodeCompiler::compile();