From nobody Wed Jan 25 01:44:55 2023 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 4P1mqW57mYz3bBrf; Wed, 25 Jan 2023 01:44:55 +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 4P1mqW4gTcz45k6; Wed, 25 Jan 2023 01:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674611095; 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=6dxyfi0yadlVJ9AGaupMMUePcD/bhhSWcCXCEtLGgVw=; b=pUkckAEAeYzrOVTVxgkF3pqm/RzrUWzkYWP0C4TgxHSCAzWnnXDqRRb0eWxJsyxl/fnKRQ Snnq6K4yAuthnjk2/6ma3OQ3zOnbSIFQ0bmr3adjCnY7Iz6dxssP2DqxSDjWjwQvzIt4HK IhgAMNPLBn1iMU9uHzTE5/4kKrHs59nNG6QZZAN3vN5rL2qfKGKKDccnLFmVY+3PwaHu4E CeW1g2O/nE9w23qoGgt8ALkFxFbmkRggAxbFoSTRNsfwQUSVEyvKH6m+rLvIqtBdXCdFes mWjLBj//2p4zpfyYvwsAfjrabesstFhyQuo3Y9fw0XSXiQ+CgiRCW3DduqX/DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674611095; 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=6dxyfi0yadlVJ9AGaupMMUePcD/bhhSWcCXCEtLGgVw=; b=lcB99bODw9hRA9gmQr4UJT/Oj8WKKqqF9VOg1lnQ61+EyC66ieoKR85k9px0ydnntkBM6J Fwoj251awbgvXs0Lu5gPUfUAHVIKoYTuurbDBHPOuM+2gculEwKxeP6HBlh/TFa6jVateE 56au0LvW6PjN/0ybR3/YyLeRBb8Dt1zR7I+TUbS6NmQ+yIL+cuf+wHoWwDuF93Daci/zQW HOVpaX4whyMeVeXIaRXjmfD3ZBkRy2UxbU025wOI6H6smv3E71/jniCngSFcgP24pqtE3C 7IkxsbbXsmvNCjT+CFT2DDo4CwALSBhwDvsMWIOHWM7SeTDsOaTVZRASRbmiXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674611095; a=rsa-sha256; cv=none; b=e7WcmSAsK7HZlAFfPwhGgMUcK+3Ne1fAZ1JzzY4hfj5SNlOV8iJ2C0uLqF6hVWxfUX+rWK h5JEgL/1FAHNPRgnaO54TTninTYohv3crtBy5xOdKHAmBlcPq9k0gRtD7q5vIqsl+zWGzn zEHgkTr4BNGVw6rtvO27qADBpC432Di1kP0kvc2+qHh55yuHmRa6/iNy4xw3euU3AlZzZA Mei7sYvg+hJ1ZSdbolNRLVw/dC1OSpSMF7NP3Xhem7HES752NJ1VrN9GHC4FP1BpvMf4j5 JmuofaSBqC18VzKDS+/awOSNP8JmnzRT+B6cBwynBXztydrxtow2mfdexy4Aaw== 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 4P1mqW3k0rzX3C; Wed, 25 Jan 2023 01:44:55 +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 30P1itiP094182; Wed, 25 Jan 2023 01:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30P1itUK094181; Wed, 25 Jan 2023 01:44:55 GMT (envelope-from git) Date: Wed, 25 Jan 2023 01:44:55 GMT Message-Id: <202301250144.30P1itUK094181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 25b18d8935a5 - main - libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__ 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25b18d8935a5ee933d5465f5db41ad58c26590f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=25b18d8935a5ee933d5465f5db41ad58c26590f9 commit 25b18d8935a5ee933d5465f5db41ad58c26590f9 Author: Konstantin Belousov AuthorDate: 2023-01-24 10:03:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-25 01:19:27 +0000 libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__ for CHERI. Requested by: arichardson Reviewed by: arichardson, emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38178 --- contrib/llvm-project/libcxx/src/atomic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/src/atomic.cpp b/contrib/llvm-project/libcxx/src/atomic.cpp index e7496fa43666..4a2e466bd145 100644 --- a/contrib/llvm-project/libcxx/src/atomic.cpp +++ b/contrib/llvm-project/libcxx/src/atomic.cpp @@ -77,7 +77,7 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo const_cast<__cxx_atomic_contention_t*>(__ptr), 0); } -#elif defined(__FreeBSD__) && defined(__LP64__) +#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8 static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val)