[llvm-branch-commits] [cfe-branch] r354858 - Merging r354721:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb 26 02:25:44 2019
New Revision: 354858

URL: http://llvm.org/viewvc/llvm-project?rev=354858&view=rev
Log:
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.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/lib/Driver/ToolChains/OpenBSD.cpp

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 26 02:25:44 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351
+/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351,354721
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/lib/Driver/ToolChains/OpenBSD.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/lib/Driver/ToolChains/OpenBSD.cpp?rev=354858&r1=354857&r2=354858&view=diff
==============================================================================
--- cfe/branches/release_80/lib/Driver/ToolChains/OpenBSD.cpp (original)
+++ cfe/branches/release_80/lib/Driver/ToolChains/OpenBSD.cpp Tue Feb 26 02:25:44 2019
@@ -227,9 +227,7 @@ void openbsd::Linker::ConstructJob(Compi
     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));
 }