COFF: Implement /lib using LibDriver.

[ruiu]

LGTM
2015/06/09 午後2:44 "Peter Collingbourne" <[e-mail]>:

Hi ruiu,

http://reviews.llvm.org/D10347

Files:

COFF/CMakeLists.txt
COFF/Driver.cpp

Index: COFF/CMakeLists.txt

• COFF/CMakeLists.txt

+++ COFF/CMakeLists.txt
@@ -16,6 +16,7 @@

${LLVM_TARGETS_TO_BUILD}
Core
LTO

+ LibDriver

MC
MCDisassembler
Support

Index: COFF/Driver.cpp

• COFF/Driver.cpp

+++ COFF/Driver.cpp
@@ -16,6 +16,7 @@
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringSwitch.h"
+#include "llvm/LibDriver/LibDriver.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
#include "llvm/Option/Option.h"
@@ -185,6 +186,11 @@

llvm::InitializeAllAsmPrinters();
llvm::InitializeAllDisassemblers();

+ If the first command line argument is "/lib", link.exe acts like
lib.exe.
+ We call our own implementation of lib.exe that understands bitcode
files.
+ if (Argc > 1 && StringRef(Argv[1]).equals_lower("/lib"))
+ return llvm::libDriverMain(Argc - 1, Argv + 1) == 0;
+

// Parse command line options.
auto ArgsOrErr = Parser.parse(Argc, Argv);
if (auto EC = ArgsOrErr.getError()) {

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/

lld/trunk/COFF/CMakeLists.txt

add_llvm_library(lldCOFF
   SymbolTable.cpp
   Symbols.cpp
   Writer.cpp
 
   LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   Core
   LTO
+  LibDriver
   MC
   MCDisassembler
   Support
   )
 
 add_dependencies(lldCOFF COFFOptionsTableGen)

lld/trunk/COFF/Driver.cpp

 #include "Driver.h"
 #include "InputFiles.h"
 #include "Memory.h"
 #include "SymbolTable.h"
 #include "Writer.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/LibDriver/LibDriver.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/TargetSelect.h"
bool LinkerDriver::link(int Argc, const char *Argv[]) {
   // Needed for LTO.
   llvm::InitializeAllTargetInfos();
   llvm::InitializeAllTargets();
   llvm::InitializeAllTargetMCs();
   llvm::InitializeAllAsmParsers();
   llvm::InitializeAllAsmPrinters();
   llvm::InitializeAllDisassemblers();
 
+  // If the first command line argument is "/lib", link.exe acts like lib.exe.
+  // We call our own implementation of lib.exe that understands bitcode files.
+  if (Argc > 1 && StringRef(Argv[1]).equals_lower("/lib"))
+    return llvm::libDriverMain(Argc - 1, Argv + 1) == 0;
+
   // Parse command line options.
   auto ArgsOrErr = Parser.parse(Argc, Argv);
   if (auto EC = ArgsOrErr.getError()) {
     llvm::errs() << EC.message() << "\n";
     return false;
   }
   std::unique_ptr<llvm::opt::InputArgList> Args = std::move(ArgsOrErr.get());