From owner-svn-src-projects@freebsd.org Sun Aug 2 18:30:30 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85A483A4B3E for ; Sun, 2 Aug 2020 18:30:30 +0000 (UTC) (envelope-from dim@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKV1y2qQnz3XW6; Sun, 2 Aug 2020 18:30:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FFB127ADB; Sun, 2 Aug 2020 18:30:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 072IUUnd072116; Sun, 2 Aug 2020 18:30:30 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 072IUUsH072115; Sun, 2 Aug 2020 18:30:30 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202008021830.072IUUsH072115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 2 Aug 2020 18:30:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363778 - projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins X-SVN-Commit-Revision: 363778 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2020 18:30:30 -0000 Author: dim Date: Sun Aug 2 18:30:29 2020 New Revision: 363778 URL: https://svnweb.freebsd.org/changeset/base/363778 Log: 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 Modified: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Modified: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h ============================================================================== --- projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Sun Aug 2 18:27:59 2020 (r363777) +++ projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Sun Aug 2 18:30:29 2020 (r363778) @@ -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