From nobody Wed Dec 22 10:05:31 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 0E9F61904D37; 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 4JJpqJ3mwCz4YN0; Wed, 22 Dec 2021 10:05:32 +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 EFA2A1B1D2; Wed, 22 Dec 2021 10:05:31 +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 1BMA5VIf091476; Wed, 22 Dec 2021 10:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5Vca091475; Wed, 22 Dec 2021 10:05:31 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:31 GMT Message-Id: <202112221005.1BMA5Vca091475@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: ad448b507431 - stable/12 - Reapply r326600 (by imp): 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: ad448b507431a6bc98c94416e8f5d8151e3750fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167533; 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=FgevLdVyTcnWae/9nC0pEXJ5LAybejECptByS5Ds9yc=; b=WNjKWo9eGbOiRkZIxR7djd1/3A1CVsYmNWLxvmRrdCMuxqxeD5KnuHSQP1lgjnrfddPRku aYD34xkuQKfZ5hir6uG/sN4mgo8TJQZiIOjSrh1rlnlEaDmJeKBWLEwaurh03tLn2G89Bg aUEg8OXXgF1UFdD7nFzjjNjqtCRX+GvVfKuGguemOXTP6RdK3JrkeN3xdHfen3IvCdrkAF gccPxJTpRLFf/QDcmvwvBKJBXgLqhZ3FVmbujfFPrvkV2d44L3wEY16/nemFetpTxBW9aG gtVlJ3GcyC/HWrrx9h3x09fhsndH+SaktpXD9Ipn0GvUp31MNJauHYGirNu40Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167533; a=rsa-sha256; cv=none; b=tWrzJxwMWRmZEcQdI3qzQzBrHQB8EcrVE/8j2oOhWIR1XNCRxyrHrAQ1SE23vErAo5slFZ xaeJvhq6amGY8ZKuTaOdFIFgig1Tvb+ejUYcQtilKYJAESkv4Hh9hsXkVwv3bPCC+T9Vbr A6aYTP9xz5vBPjdcJVF5bDgNFPSOw2t8A0RA1Jvnf1ekjxEJaZ4OQBq63yVpmpKD32gRDo mOlbel+8TW72gprL2gPklmYIpq/bJUzrgg+nS0cm0UC8ix8epXj1QV1Qqo4SNg6Pxh5fmY SfSDznQ8KFunANG/joUeVs8LZvkYClJ9ixaRDMpbZFIOm6noIpGfIaKs5puEWg== 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=ad448b507431a6bc98c94416e8f5d8151e3750fd commit ad448b507431a6bc98c94416e8f5d8151e3750fd Author: Dimitry Andric AuthorDate: 2020-08-02 18:30:29 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:14 +0000 Reapply r326600 (by imp): Since this is contrib code, create an upstreamable version of my change. Now on FreeBSD and NetBSD if _STANDALONE is defined, we include the kernel version with alloances for the quirky differences between the two. Sponsored by: Netflix (cherry picked from commit dd6565b7a60d228f021190a538caeb652275dc5c) --- contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h b/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h index 713deddb5698..4a972da23fcc 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h +++ b/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h @@ -72,12 +72,16 @@ #error Unsupported target #endif -#if defined(__NetBSD__) && (defined(_KERNEL) || defined(_STANDALONE)) +#if (defined(__FreeBSD__) || defined(__NetBSD__)) && (defined(_KERNEL) || defined(_STANDALONE)) // // Kernel and boot environment can't use normal headers, // so use the equivalent system headers. // +#ifdef __FreeBSD__ +#include +#else #include +#endif #include #include #else