[PATCH] D18410: ELF: Split BitcodeCompiler::compile.

[Rui Ueyama via llvm-commits]

ruiu created this revision.
ruiu added a reviewer: davide.
ruiu added a subscriber: llvm-commits.
Herald added a subscriber: joker.eph.

ELF: Split BitcodeCompiler::compile.

http://reviews.llvm.org/D18410

Files:
  ELF/LTO.cpp
  ELF/LTO.h

Index: ELF/LTO.h
===================================================================
--- ELF/LTO.h
+++ ELF/LTO.h
@@ -39,6 +39,8 @@
   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};
Index: ELF/LTO.cpp
===================================================================
--- ELF/LTO.cpp
+++ ELF/LTO.cpp
@@ -103,23 +103,7 @@
   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);
@@ -138,6 +122,22 @@
   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();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18410.51455.patch
Type: text/x-patch
Size: 2241 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160323/98fb05b3/attachment.bin>