diff options
| author | Rui Ueyama <ruiu@google.com> | 2017-07-18 21:07:13 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2017-07-18 21:07:13 +0000 |
| commit | 6db83a3af3603603b9d7e3e50b3d10c43aef278d (patch) | |
| tree | 6e0e5e3d2f61107dd54a7bf9899948221def66c2 /llvm/tools/llvm-ar | |
| parent | 9b6e9899f2c9fbdd9a1f912c52ffe1ca6bc6c40f (diff) | |
| download | bcm5719-llvm-6db83a3af3603603b9d7e3e50b3d10c43aef278d.tar.gz bcm5719-llvm-6db83a3af3603603b9d7e3e50b3d10c43aef278d.zip | |
Revert r308329: llvm: add llvm-dlltool support to the archiver
This reverts commit r308329 because it broke buildbots.
llvm-svn: 308374
Diffstat (limited to 'llvm/tools/llvm-ar')
| -rw-r--r-- | llvm/tools/llvm-ar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/llvm/tools/llvm-ar/CMakeLists.txt b/llvm/tools/llvm-ar/CMakeLists.txt index 731bcbd8ac9..3bb0c8f7b7c 100644 --- a/llvm/tools/llvm-ar/CMakeLists.txt +++ b/llvm/tools/llvm-ar/CMakeLists.txt @@ -1,7 +1,6 @@ set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} Core - DlltoolDriver LibDriver Object Support @@ -16,4 +15,3 @@ add_llvm_tool(llvm-ar add_llvm_tool_symlink(llvm-ranlib llvm-ar) add_llvm_tool_symlink(llvm-lib llvm-ar) -add_llvm_tool_symlink(llvm-dlltool llvm-ar) diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index af4d3efa52f..500507fd496 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -16,7 +16,6 @@ #include "llvm/ADT/Triple.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" -#include "llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h" #include "llvm/ToolDrivers/llvm-lib/LibDriver.h" #include "llvm/Object/Archive.h" #include "llvm/Object/ArchiveWriter.h" @@ -864,9 +863,6 @@ int main(int argc, char **argv) { llvm::InitializeAllAsmParsers(); StringRef Stem = sys::path::stem(ToolName); - if (Stem.find("dlltool") != StringRef::npos) - return dlltoolDriverMain(makeArrayRef(argv, argc)); - if (Stem.find("ranlib") == StringRef::npos && Stem.find("lib") != StringRef::npos) return libDriverMain(makeArrayRef(argv, argc)); @@ -882,5 +878,5 @@ int main(int argc, char **argv) { return ranlib_main(); if (Stem.find("ar") != StringRef::npos) return ar_main(); - fail("Not ranlib, ar, lib or dlltool!"); + fail("Not ranlib, ar or lib!"); } |
