diff options
author | Keith Smiley <keithbsmiley@gmail.com> | 2021-12-02 11:10:41 -0800 |
---|---|---|
committer | Keith Smiley <keithbsmiley@gmail.com> | 2021-12-02 16:29:26 -0800 |
commit | ace03d0df4fa861981c79a38892584bcbc4e3c15 (patch) | |
tree | a2e02a00fa3d9e4081e3f97516368dd8d9cba966 /clang/lib/Driver/ToolChain.cpp | |
parent | a8c7e56ac18c892ee6b660167cd912f0feff28e8 (diff) | |
download | llvm-ace03d0df4fa861981c79a38892584bcbc4e3c15.zip llvm-ace03d0df4fa861981c79a38892584bcbc4e3c15.tar.gz llvm-ace03d0df4fa861981c79a38892584bcbc4e3c15.tar.bz2 |
[clang][Darwin] Remove old lld implementation handling
This now assumes that for the darwin driver any lld is the "new" macho
lld implementation.
Differential Revision: https://reviews.llvm.org/D114974
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 6588cdf..ac033dd 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -541,12 +541,9 @@ std::string ToolChain::GetProgramPath(const char *Name) const { return D.GetProgramPath(Name, *this); } -std::string ToolChain::GetLinkerPath(bool *LinkerIsLLD, - bool *LinkerIsLLDDarwinNew) const { +std::string ToolChain::GetLinkerPath(bool *LinkerIsLLD) const { if (LinkerIsLLD) *LinkerIsLLD = false; - if (LinkerIsLLDDarwinNew) - *LinkerIsLLDDarwinNew = false; // Get -fuse-ld= first to prevent -Wunused-command-line-argument. -fuse-ld= is // considered as the linker flavor, e.g. "bfd", "gold", or "lld". @@ -599,11 +596,8 @@ std::string ToolChain::GetLinkerPath(bool *LinkerIsLLD, std::string LinkerPath(GetProgramPath(LinkerName.c_str())); if (llvm::sys::fs::can_execute(LinkerPath)) { - // FIXME: Remove LinkerIsLLDDarwinNew once there's only one MachO lld. if (LinkerIsLLD) - *LinkerIsLLD = UseLinker == "lld" || UseLinker == "lld.darwinold"; - if (LinkerIsLLDDarwinNew) - *LinkerIsLLDDarwinNew = UseLinker == "lld"; + *LinkerIsLLD = UseLinker == "lld"; return LinkerPath; } } |