git: a140a745c4da - stable/13 - libcxx: use __SIZEOF_LONG__ == 8 instead of __LP64__
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 Jan 2023 00:39:07 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=a140a745c4da50111b0b7ef995b4f0fc75eeca1a
commit a140a745c4da50111b0b7ef995b4f0fc75eeca1a
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-01-24 10:03:45 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
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)