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

llvm: openbsd driver had one -lcompiler_rt too many

Tested by doing a full system build locally. Will work with brad@ for
upstream-ing.

OK patrick & mortimer
---

diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
index 5333cecd285..7d3837e453f 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
@@ -189,9 +189,6 @@ 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))