diff options
| author | Oliver Stannard <oliver.stannard@linaro.org> | 2020-04-02 13:09:57 +0100 |
|---|---|---|
| committer | Oliver Stannard <oliver.stannard@linaro.org> | 2020-04-02 13:23:30 +0100 |
| commit | af39151f3c54b90ff0ae1064f540a97b640298e9 (patch) | |
| tree | 1b7283a0c74d15c59a953caca588d4c7c747283c /lld/tools | |
| parent | 9da6a40e0999523f8bdabfdab875890770eb9b3a (diff) | |
| download | llvm-af39151f3c54b90ff0ae1064f540a97b640298e9.tar.gz | |
Revert "[lld] Initial commit for new Mach-O backend"
This is causing buildbot failures on 32-bit hosts, for example:
http://lab.llvm.org:8011/builders/clang-cmake-armv8-lld/builds/3636
This reverts commit 03f43b3aca363e16c45d8733400fd0083b1af4d8.
Diffstat (limited to 'lld/tools')
| -rw-r--r-- | lld/tools/lld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lld/tools/lld/lld.cpp | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt index 2cdd9b854246..a37c2c702bd5 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -16,7 +16,6 @@ target_link_libraries(lld lldCOFF lldDriver lldELF - lldMachO2 lldMinGW lldWasm ) diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp index 58a291d1e921..646fc3d6468e 100644 --- a/lld/tools/lld/lld.cpp +++ b/lld/tools/lld/lld.cpp @@ -45,11 +45,10 @@ using namespace llvm::sys; enum Flavor { Invalid, - Gnu, // -flavor gnu - WinLink, // -flavor link - Darwin, // -flavor darwin - DarwinNew, // -flavor darwinnew - Wasm, // -flavor wasm + Gnu, // -flavor gnu + WinLink, // -flavor link + Darwin, // -flavor darwin + Wasm, // -flavor wasm }; LLVM_ATTRIBUTE_NORETURN static void die(const Twine &s) { @@ -63,7 +62,6 @@ static Flavor getFlavor(StringRef s) { .CasesLower("wasm", "ld-wasm", Wasm) .CaseLower("link", WinLink) .CasesLower("ld64", "ld64.lld", "darwin", Darwin) - .CaseLower("darwinnew", DarwinNew) .Default(Invalid); } @@ -159,8 +157,6 @@ int main(int argc, const char **argv) { return !coff::link(args, canExitEarly(), llvm::outs(), llvm::errs()); case Darwin: return !mach_o::link(args, canExitEarly(), llvm::outs(), llvm::errs()); - case DarwinNew: - return !macho::link(args, canExitEarly(), llvm::outs(), llvm::errs()); case Wasm: return !wasm::link(args, canExitEarly(), llvm::outs(), llvm::errs()); default: |