diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-02-26 10:25:44 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-02-26 10:25:44 +0000 |
| commit | 23f8e678cd75b582c55813c317c40b2c3e0a1fce (patch) | |
| tree | e90c4f8c4d40c4a32437d16f9773697fbcce4b47 | |
| parent | aa2c7b0ed88f174a0f10b496184b569117a680f1 (diff) | |
Merging r354721:
------------------------------------------------------------------------
r354721 | brad | 2019-02-23 07:19:28 +0100 (Sat, 23 Feb 2019) | 4 lines
Remove sanitizer context workaround no longer necessary
The base linker is now lld.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_80@354858 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/ToolChains/OpenBSD.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/Driver/ToolChains/OpenBSD.cpp b/lib/Driver/ToolChains/OpenBSD.cpp index 3d35d37b7d..6b02e68965 100644 --- a/lib/Driver/ToolChains/OpenBSD.cpp +++ b/lib/Driver/ToolChains/OpenBSD.cpp @@ -227,9 +227,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend))); } - const char *Exec = Args.MakeArgString( - !NeedsSanitizerDeps ? ToolChain.GetLinkerPath() - : ToolChain.GetProgramPath("ld.lld")); + const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath()); C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); } |