From nobody Tue Jan 31 00:39:08 2023 X-Original-To: dev-commits-src-branches@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 4P5R4s0zhBz3bt9c; Tue, 31 Jan 2023 00:39:09 +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 4P5R4s0JZNz4WK2; Tue, 31 Jan 2023 00:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125549; 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=93/Lj8YlAJuLAyQHgG1wMYpaSdX1l3tFKA2pxr+qLaw=; b=aFKFajollQgCUSqgb+08NK8OImefMoO2Lwk5QVCdmqfNwlVvokizEO8ag1GPZvFLtWxU35 czAq/qZ4aJI6r0KNNFc3hQPoamWFJvkcGZwf+zz2rfogHN3BtsqIrNyrEGQNuitZZYjM0W jEGzATXhwY8i6n3tXV14YfxeZxxgQqTg03pUK99/ONLPmcbi3pTz+bneA1Twam0kRwKbJD mGXT0vVFPdZPF9ENQlf7d2dZgdJk4pSikSvMrb0FxRrRmIOKzGuthAxFl2NbEmfiTlrDGq 8Vp5jKhEdKfm45DEjZNEs7vTEdlIboiW0ICc3WBb6WnpjtiXxbb+hs10JodsZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125549; 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=93/Lj8YlAJuLAyQHgG1wMYpaSdX1l3tFKA2pxr+qLaw=; b=U9cY6tcRjie2VJR1X5SLhjwqFoCTvzPvnAWAqlmfcVh9dQGn+Ui76hFDdx2qSMldfq6jIy mmODhSFaRV3lcSR1rTlN9t+QwYCF3jy8O7epHvpAjWpfoCaatCG2NYiOyNhtftg6uQV4Zl Gge/Iu/RyT8wKTMJsTiZ3z+MruDlWlt3tEvTWZLxR91Ol5RbzqjzbdnhoL0tUgcIf9ZEzK eDCgH6zG7aeEtxhCJZB2LIASVjPUV7Px+obKw05i3PB8KuxvOvlK8Fc6FynIlzzoYak11N Y3XfHJxZjh7M4nOHGcTO31V66otJ5BFBa3QIIdd0uSRTykRXiCkv8bYscZ01AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125549; a=rsa-sha256; cv=none; b=iQzP7ATaU20zP4sNLdLt7NRRESe3wJoQkYMWQCpaMX+BxyMlMmq+PpKcRk2x522kftPnAl 0kC8Wa44HfpflNAn68VWaCj4YwnQAHhCo4P9gW06QbLYA+YHXkC1ybL4GegcPRvYkG9iIp YJ58YKlhlqn9Nhe51Z/BZ/ZFA/a40++AP8AzlZ/pcteLLpYVW686fU7kpJUiEfl40EeIHD wkOvvtColVWraPrmYwGAJPtzwydQ7+dn6UFKEc7dJnlHase9oi2hk2ZongltClyXCZC1u7 mF1c5XhIv8s1gtXacpynu4WJvBP4Olc80BM/Y1SbeOZhMX2zS4f1nQWzrXIw5w== 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 4P5R4r6WKyzTxh; Tue, 31 Jan 2023 00:39:08 +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 30V0d8dT059550; Tue, 31 Jan 2023 00:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d8Hl059549; Tue, 31 Jan 2023 00:39:08 GMT (envelope-from git) Date: Tue, 31 Jan 2023 00:39:08 GMT Message-Id: <202301310039.30V0d8Hl059549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c8d8e959b51a - stable/13 - libcxx: add comment explaining why umtx is only used for 64bits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8d8e959b51a47a623a0c46d5966009455912f04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d8e959b51a47a623a0c46d5966009455912f04 commit c8d8e959b51a47a623a0c46d5966009455912f04 Author: Konstantin Belousov AuthorDate: 2023-01-24 15:36:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-31 00:38:18 +0000 libcxx: add comment explaining why umtx is only used for 64bits (cherry picked from commit 4c4a29267cbdd05471322e03bfd5eff8eb68e750) --- contrib/llvm-project/libcxx/src/atomic.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index 6f85c86aad8f..7bd9205a963b 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -78,6 +78,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo } #elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8 && !defined(__mips__) +/* + * Since __cxx_contention_t is int64_t even on 32bit FreeBSD + * platforms, we have to use umtx ops that work on the long type, and + * limit its use to architectures where long and int64_t are synonyms. + */ static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val)