From nobody Tue Jan 31 00:39:07 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 4P5R4q75Ttz3btGg; Tue, 31 Jan 2023 00:39:07 +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 4P5R4q6hNJz4WJQ; Tue, 31 Jan 2023 00:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125547; 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=RYiU/iqtQcXCBgld1e5ddrXfuzqD4+LoFPDtHfuRSSs=; b=tP1X5AJ/hj+YI33+lnsnKneLEv5zdw1mqZBR9hE//KLx+yVkHcsrFyylQHnu2tlrsi4/0c QWM5AiitiNagCbEHN0SL799jJQ0jZlP2OmlkZsIc6mscF2VacROWgEsBHBpsjI44J7kBZe oSpRnKJxYgA4WSoDfsp3SGP1bXsImeLYzyMgQ3dkVTh9ZpqbBhRtGEU568wDhY2QTWB0pT 5bRQASEjGlkQds9ccWdg8Z5oZfEjnuchTwEZ0gsJ9mjujrg3UqFXQdePp0OPTB3erevfc/ 8pXN3eFU00pan9xgS779ooTfoAJeL91DUr8Vn18y/vHPAsyh5/rQb0hPz16nNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125547; 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=RYiU/iqtQcXCBgld1e5ddrXfuzqD4+LoFPDtHfuRSSs=; b=LkmhOATWfLzvszaFwFdYQa590BpQ1AMQfa4KHfqA7UjYNtnBtpz4oMeJow4bgRSEyIOfYM B6ARFbvqqDK0QnqXswVNpQaywJJDNcA1Yr8cmcbZ5TTKsk9uhPxmA5hviKGlte0hxe2CoU FcyupAwtULEYbqdutciUxKiIEyHGd/+2XE/bqu6FMgWVOo5NH9F4yt0jb9LGoazEjW1Zn8 xuYjny/mReHorSUz6Rw/P3F8HqJ8xzGb0Om/Zqu+zVBCinruBRW+T8uobADqBsalRPSU0V r3oW6t2YwOu6e7MLjpxdh/cXmQ80rdxTzPoWZ7Pq8xJczrmWNpprTTvWTJfv5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125547; a=rsa-sha256; cv=none; b=em8/gGvyPN1T8NPCtFgWMlPo0aDx5FMp7qsu1Bkbx38bbdZcenJ+kJ2PRAGwyFB8Tlx0NV iOzGrOmuI1sUTJ8dlkeqBVjmXWotYqVt6FPk5/42J+r4VxpZHuGT9KoHR2EhFVt1cqLF6K tBUEw6sKcOb0TRoyPak84Chb0hW8DygIqvpFpwRMTs+I0sKnaGGG1db5kKTnthC0Izj3hI mAbSUNi2dj4gEiHh0c6BqzlbMwcM81Y29L0S6As+MIs7QZAo90oOBIb1v46VAmOqBpPozC K7pw1k54TCr+/DXAmqt7bru//kGmzssozrxG5OnxQ33L0niU6SgyQe9rz0++DQ== 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 4P5R4q5mQ4zTy3; Tue, 31 Jan 2023 00:39:07 +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 30V0d7kb059526; Tue, 31 Jan 2023 00:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0d78t059525; Tue, 31 Jan 2023 00:39:07 GMT (envelope-from git) Date: Tue, 31 Jan 2023 00:39:07 GMT Message-Id: <202301310039.30V0d78t059525@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: a140a745c4da - stable/13 - libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__ 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: a140a745c4da50111b0b7ef995b4f0fc75eeca1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a140a745c4da50111b0b7ef995b4f0fc75eeca1a commit a140a745c4da50111b0b7ef995b4f0fc75eeca1a Author: Konstantin Belousov AuthorDate: 2023-01-24 10:03:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-31 00:38:18 +0000 libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__ For MFC, 64bit mips is excluded from the new mode of wait/wake, because it uses 32bit __cxx_contention_t, as noted by jrtc27. (cherry picked from commit 25b18d8935a5ee933d5465f5db41ad58c26590f9) --- 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..6f85c86aad8f 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 && !defined(__mips__) static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val)