Move LTO support library to a component, allowing it to be tested

more reliably across platforms.  Patch by Tom Roeder!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191343 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 51 insertions, 30 deletions

diff --git a/tools/llvm-lto/CMakeLists.txt b/tools/llvm-lto/CMakeLists.txt
index b253b69c1bc..348976cb811 100644
--- a/tools/llvm-lto/CMakeLists.txt
+++ b/tools/llvm-lto/CMakeLists.txt
@@ -1,7 +1,6 @@
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} lto support)
+
 add_llvm_tool(llvm-lto
   llvm-lto.cpp
   )
 
-target_link_libraries(llvm-lto LTO LLVMSupport)
-
-add_dependencies(llvm-lto lto)
diff --git a/tools/llvm-lto/LLVMBuild.txt b/tools/llvm-lto/LLVMBuild.txt
new file mode 100644
index 00000000000..c1613a34c0e
--- /dev/null
+++ b/tools/llvm-lto/LLVMBuild.txt
@@ -0,0 +1,22 @@
+;===- ./tools/llvm-lto/LLVMBuild.txt ----------------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Tool
+name = llvm-lto
+parent = Tools
+required_libraries = LTO Support all-targets
diff --git a/tools/llvm-lto/Makefile b/tools/llvm-lto/Makefile
index 1b1a1f8b389..f1801b4b20c 100644
--- a/tools/llvm-lto/Makefile
+++ b/tools/llvm-lto/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llvm-lto
-LINK_COMPONENTS := support
+LINK_COMPONENTS := lto ipo scalaropts linker bitreader bitwriter mcdisassembler support target vectorize all-targets
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS := 1
@@ -17,6 +17,3 @@ TOOL_NO_EXPORTS := 1
 NO_INSTALL := 1
 
 include $(LEVEL)/Makefile.common
-
-LDFLAGS += -L$(LibDir)
-LIBS += -lLTO
diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp
index f25037c37aa..82a2c8288f1 100644
--- a/tools/llvm-lto/llvm-lto.cpp
+++ b/tools/llvm-lto/llvm-lto.cpp
@@ -12,12 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm-c/lto.h"
+#include "llvm/LTO/LTOCodeGenerator.h"
+#include "llvm/LTO/LTOModule.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/TargetSelect.h"
 
 using namespace llvm;
 
@@ -37,46 +39,48 @@ int main(int argc, char **argv) {
   llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
   cl::ParseCommandLineOptions(argc, argv, "llvm LTO linker\n");
 
+  // Initialize the configured targets.
+  InitializeAllTargets();
+  InitializeAllTargetMCs();
+  InitializeAllAsmPrinters();
+  InitializeAllAsmParsers();
+
   unsigned BaseArg = 0;
   std::string ErrorMessage;
 
-  lto_code_gen_t code_gen = lto_codegen_create();
-  if (code_gen == NULL)
-    errs() << argv[0] << ": error creating a code generation module: "
-           << lto_get_error_message() << "\n";
+  LTOCodeGenerator CodeGen;
 
-  lto_codegen_set_pic_model(code_gen, LTO_CODEGEN_PIC_MODEL_DYNAMIC);
-  lto_codegen_set_debug_model(code_gen, LTO_DEBUG_MODEL_DWARF);
+  CodeGen.setCodePICModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC);
+  CodeGen.setDebugInfo(LTO_DEBUG_MODEL_DWARF);
 
   for (unsigned i = BaseArg; i < InputFilenames.size(); ++i) {
-    lto_module_t BitcodeModule = lto_module_create(InputFilenames[i].c_str());
-    if (BitcodeModule == NULL) {
+    std::string error;
+    OwningPtr<LTOModule> Module(LTOModule::makeLTOModule(InputFilenames[i].c_str(),
+                                                         error));
+    if (!error.empty()) {
       errs() << argv[0] << ": error loading file '" << InputFilenames[i]
-             << "': " << lto_get_error_message() << "\n";
+             << "': " << error << "\n";
       return 1;
     }
 
-    if (lto_codegen_add_module(code_gen, BitcodeModule)) {
+
+    if (!CodeGen.addModule(Module.get(), error)) {
       errs() << argv[0] << ": error adding file '" << InputFilenames[i]
-             << "': " << lto_get_error_message() << "\n";
-      lto_module_dispose(BitcodeModule);
+             << "': " << error << "\n";
       return 1;
     }
-
-    lto_module_dispose(BitcodeModule);
   }
 
   if (!OutputFilename.empty()) {
     size_t len = 0;
-    const void *Code = lto_codegen_compile(code_gen, &len);
+    std::string ErrorInfo;
+    const void *Code = CodeGen.compile(&len, ErrorInfo);
     if (Code == NULL) {
       errs() << argv[0]
-             << ": error compiling the code: " << lto_get_error_message()
-             << "\n";
+             << ": error compiling the code: " << ErrorInfo << "\n";
       return 1;
     }
 
-    std::string ErrorInfo;
     raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo);
     if (!ErrorInfo.empty()) {
       errs() << argv[0] << ": error opening the file '" << OutputFilename
@@ -86,10 +90,11 @@ int main(int argc, char **argv) {
 
     FileStream.write(reinterpret_cast<const char *>(Code), len);
   } else {
+    std::string ErrorInfo;
     const char *OutputName = NULL;
-    if (lto_codegen_compile_to_file(code_gen, &OutputName)) {
+    if (!CodeGen.compile_to_file(&OutputName, ErrorInfo)) {
       errs() << argv[0]
-             << ": error compiling the code: " << lto_get_error_message()
+             << ": error compiling the code: " << ErrorInfo
              << "\n";
       return 1;
     }
@@ -97,7 +102,5 @@ int main(int argc, char **argv) {
     outs() << "Wrote native object file '" << OutputName << "'\n";
   }
 
-  lto_codegen_dispose(code_gen);
-
   return 0;
 }