From nobody Wed Dec 22 10:05:30 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 897AA1904C5A; 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 4JJpqJ34JFz4YJb; 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 C9F5A1B456; Wed, 22 Dec 2021 10:05:30 +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 1BMA5Ur4091452; Wed, 22 Dec 2021 10:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5UAx091451; Wed, 22 Dec 2021 10:05:30 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:30 GMT Message-Id: <202112221005.1BMA5UAx091451@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: 2c18bcdec1c9 - stable/12 - Reapply r322168 (partially, by br): 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: 2c18bcdec1c9b2759829a49e11d583b43fd0b072 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=zueJ/TrJJTfmGsCAkToqiX78FcKfSlVgTV8L0LQwKAc=; b=cb4ZKSfEdB9ow+aE0owYDckYenZWOAe5kyFUhduNtHWdBF9u6BI1PGfCnJYiShB8CMNHXC zOsVeORXvNS7YJk+eTo+WhRCWryAwE76kpwj8f1fi9OMBxmVqUhtpccO4lJV9i9hWavgLA lXrxYdw8B8ra77zoEd7qOV1c7eiPXOYFT5UFsKPuQeHbdghtaqUIEYlbqoS2iM1tpcZsX3 ZRvnoT77cy9bK1lMHq2DmIqs7QUwFrs6boVwKH5aMjo8wqyO76D6afVjCFKtMdHU/Yh7u3 x3wudNOwoAxq4NTt4d9y2YVmhO55mmxo4tXAuapf0hiYGOYaMxKm31tW8ufHLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167534; a=rsa-sha256; cv=none; b=uHrzH8Z+P90vn+/twiTpyEi/9DiGAsLR3YL4GZv0UsS0z0+LEtLYIhGc0XYFs0kvkDCjMc myVZ+XW3qxik6zLcQxJc1tXS+7ocHh78Xp7vlwbi0qKcVUAJZQEbmiE8rqXWx5Ci0t4hl4 xILN1rFmE5MlZx67T2l3tAxmUXYN2MFjB6NjUJkhrYt1PVIGFan4pFi2+MC+f4NftNILFr 3CJld8H5Pcx39jBCERVaVswa4L0tpKoBqYl7GDRhaFwyEoZyf5FhEpEa+d1DToW32lFa9m W6C7nUfhjXx9PvmKZWK3KJaBWA/jqPDcO9SWBqVUtA7kL/JJS9EM96bPdB8Mvw== 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=2c18bcdec1c9b2759829a49e11d583b43fd0b072 commit 2c18bcdec1c9b2759829a49e11d583b43fd0b072 Author: Dimitry Andric AuthorDate: 2020-08-02 18:27:59 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:13 +0000 Reapply r322168 (partially, by br): o Replace __riscv__ with __riscv o Replace __riscv64 with (__riscv && __riscv_xlen == 64) This is required to support new GCC 7.1 compiler. This is compatible with current GCC 6.1 compiler. RISC-V is extensible ISA and the idea here is to have built-in define per each extension, so together with __riscv we will have some subset of these as well (depending on -march string passed to compiler): __riscv_compressed __riscv_atomic __riscv_mul __riscv_div __riscv_muldiv __riscv_fdiv __riscv_fsqrt __riscv_float_abi_soft __riscv_float_abi_single __riscv_float_abi_double __riscv_cmodel_medlow __riscv_cmodel_medany __riscv_cmodel_pic __riscv_xlen Reviewed by: ngie Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D11901 (cherry picked from commit fd28fec2f0ba63a68ca0c9a041facc4fd86f4ba8) --- .../lib/sanitizer_common/sanitizer_platform_limits_posix.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 658b0abaece8..c3f9c1f0986d 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -122,7 +122,7 @@ const unsigned struct_kexec_segment_sz = 4 * sizeof(unsigned long); #if SANITIZER_LINUX -#if defined(__powerpc64__) || defined(__s390__) +#if defined(__powerpc64__) || defined(__riscv) || defined(__s390__) const unsigned struct___old_kernel_stat_sz = 0; #elif !defined(__sparc__) const unsigned struct___old_kernel_stat_sz = 32; @@ -523,7 +523,7 @@ typedef long long __sanitizer___kernel_off_t; typedef long __sanitizer___kernel_off_t; #endif -#if defined(__powerpc__) || defined(__mips__) +#if defined(__powerpc__) || defined(__mips__) || defined(__riscv) typedef unsigned int __sanitizer___kernel_old_uid_t; typedef unsigned int __sanitizer___kernel_old_gid_t; #else