From nobody Wed Dec 22 10:05:33 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 871871904C59; Wed, 22 Dec 2021 10:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpqK6YyTz4YVB; Wed, 22 Dec 2021 10:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2465D1B457; Wed, 22 Dec 2021 10:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5XaX091502; Wed, 22 Dec 2021 10:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5XQq091501; Wed, 22 Dec 2021 10:05:33 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:33 GMT Message-Id: <202112221005.1BMA5XQq091501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 184e7a37179e - stable/12 - Reapply r327026 (partially): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 184e7a37179eb1693fc3d40feaf7da9062d0791c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8kT8qFV2WHloAc1scilhbyCNw/2wN15p363L8z9XfI=; b=NzaEM1uc39PNMXN961ONOy15gkANVyVuTD/Rmo8fc/e5KDYlf8IMsNSFNVf47tYh4xpF2B U2my30hUr2aKA0IM35AJ3H4MVLStK6zsFrCx1Kh3IXGiTRRRQpMaLJ9s1MTAB3F0MmjbCP 4JGI/4tuYl+mAgt/F2S+oBLT0pQ2Q0SLw82tCDg+vQjfFChVbcGKz0L+vc3V6NVLtDY+zD E/PhjANOBOzY9Eo52CPra3uJd1Y0fuCIVWILv7kxAR8mlhFbYrhSKXDeELa6Ih12gseozH pKwWbxb946erB77eNUBjZqjpJQKAO3NjcN7fItrkJ24EGGEzXnm2UL14De1yuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167534; a=rsa-sha256; cv=none; b=WkAfsm1MLoYbD3813zwAHBwF/wt9KVT/iOeIBrZEYNA65uNKMAYw1GH7iSMhbvuU+m89ZH dLMWZnuMqrV3QXQi90p6jC+a6sBvaEEjrRSPDB0RV+U+PIUGOuQBnsH3G73iv9l8uoDWjB 53h4L0im613x8iHZivqW9ZSvVmExoSqO1Kgn3EDdVnoM5/mdgQLE3iyZNFJXgOOsHq+Vzi s98Xb1QYbIEp/C90lAxkWu3U9hm55YOEmqixl5B3RZ32zyw4If2YZB+/QTHPdShDICWsdx VrzVL92G2Bnxc5O1VTMMbhTnIPzT3IuNC0jQnhd5YqyUX3b8LNlioR/UWBGhag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=184e7a37179eb1693fc3d40feaf7da9062d0791c commit 184e7a37179eb1693fc3d40feaf7da9062d0791c Author: Dimitry Andric AuthorDate: 2020-08-02 18:34:29 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:14 +0000 Reapply r327026 (partially): Merge lld trunk r321017 to contrib/llvm/tools/lld. (Note that in this merge, I foolishly combined upstream changes with this local change. But only this ifdef part is really needed, as we always default to ELF link mode.) (cherry picked from commit 59948e95d8deadafca3acd659b6dfc78b708f117) --- contrib/llvm-project/lld/tools/lld/lld.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/lld/tools/lld/lld.cpp b/contrib/llvm-project/lld/tools/lld/lld.cpp index 8a8f8d04bbda..c1a117e9cc3e 100644 --- a/contrib/llvm-project/lld/tools/lld/lld.cpp +++ b/contrib/llvm-project/lld/tools/lld/lld.cpp @@ -142,6 +142,9 @@ int main(int argc, const char **argv) { InitLLVM x(argc, argv); std::vector args(argv, argv + argc); +#ifdef __FreeBSD__ + return !elf::link(args, canExitEarly(), llvm::outs(), llvm::errs()); +#else switch (parseFlavor(args)) { case Gnu: if (isPETarget(args)) @@ -160,4 +163,5 @@ int main(int argc, const char **argv) { "Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld" " (WebAssembly) instead"); } +#endif }