diff options
| author | Keith Smiley <keithbsmiley@gmail.com> | 2021-11-30 22:01:07 -0800 |
|---|---|---|
| committer | Keith Smiley <keithbsmiley@gmail.com> | 2021-12-02 11:04:49 -0800 |
| commit | 9e3552523ebd3385487e01e3e7af37b8c0efaf57 (patch) | |
| tree | f4dc1bf57d29f190058cfec7cc9eaba0b5522d16 /lld/tools | |
| parent | 98dd2f9ed3ddb0a114582d48d48f781d9c80a2da (diff) | |
| download | llvm-9e3552523ebd3385487e01e3e7af37b8c0efaf57.tar.gz | |
[lld-macho] Remove old macho darwin lld
During the llvm round table it was generally agreed that the newer macho
lld implementation is feature complete enough to replace the old
implementation entirely. This will reduce confusion for new users who
aren't aware of the history.
Differential Revision: https://reviews.llvm.org/D114842
Diffstat (limited to 'lld/tools')
| -rw-r--r-- | lld/tools/lld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lld/tools/lld/lld.cpp | 15 |
2 files changed, 6 insertions, 12 deletions
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt index b0b24a007214..c5c86c604c67 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -13,7 +13,6 @@ target_link_libraries(lld PRIVATE lldCommon lldCOFF - lldDriver lldELF lldMachO lldMinGW @@ -25,7 +24,7 @@ install(TARGETS lld if(NOT LLD_SYMLINKS_TO_CREATE) set(LLD_SYMLINKS_TO_CREATE - lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld) + lld-link ld.lld ld64.lld wasm-ld) endif() foreach(link ${LLD_SYMLINKS_TO_CREATE}) diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp index bfd4370d3f2d..cad97f2153c2 100644 --- a/lld/tools/lld/lld.cpp +++ b/lld/tools/lld/lld.cpp @@ -48,11 +48,10 @@ using namespace llvm::sys; enum Flavor { Invalid, - Gnu, // -flavor gnu - WinLink, // -flavor link - Darwin, // -flavor darwin - DarwinOld, // -flavor darwinold - Wasm, // -flavor wasm + Gnu, // -flavor gnu + WinLink, // -flavor link + Darwin, // -flavor darwin + Wasm, // -flavor wasm }; [[noreturn]] static void die(const Twine &s) { @@ -65,9 +64,7 @@ static Flavor getFlavor(StringRef s) { .CasesLower("ld", "ld.lld", "gnu", Gnu) .CasesLower("wasm", "ld-wasm", Wasm) .CaseLower("link", WinLink) - .CasesLower("ld64", "ld64.lld", "darwin", "darwinnew", - "ld64.lld.darwinnew", Darwin) - .CasesLower("darwinold", "ld64.lld.darwinold", DarwinOld) + .CasesLower("ld64", "ld64.lld", "darwin", Darwin) .Default(Invalid); } @@ -151,8 +148,6 @@ static int lldMain(int argc, const char **argv, llvm::raw_ostream &stdoutOS, return !coff::link(args, exitEarly, stdoutOS, stderrOS); case Darwin: return !macho::link(args, exitEarly, stdoutOS, stderrOS); - case DarwinOld: - return !mach_o::link(args, exitEarly, stdoutOS, stderrOS); case Wasm: return !lld::wasm::link(args, exitEarly, stdoutOS, stderrOS); default: |