From: gnezdo <gnezdo@openbsd.org>
Date: Sun, 29 Aug 2021 21:32:52 +0000 (+0000)
Subject: Revert: llvm: openbsd driver had one -lcompiler_rt too many
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0fc8bc1345e48d2a91ce3f149c4e1f63399995f0;p=openbsd

Revert: llvm: openbsd driver had one -lcompiler_rt too many

Suggested by jca@ that kettenis@ looks at it first.
---

diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
index 7d3837e453f..5333cecd285 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
@@ -189,6 +189,9 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins"));
       linkXRayRuntimeDeps(ToolChain, CmdArgs);
     }
+    // FIXME: For some reason GCC passes -lgcc before adding
+    // the default system libraries. Just mimic this for now.
+    CmdArgs.push_back("-lcompiler_rt");
 
     if (Args.hasArg(options::OPT_pthread)) {
       if (!Args.hasArg(options::OPT_shared) && Args.hasArg(options::OPT_pg))