aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2023-01-24 10:03:45 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2023-01-31 00:38:18 +0000
commita140a745c4da50111b0b7ef995b4f0fc75eeca1a (patch)
tree96d92d9aa4ad1aaab454345aa71888974aa5dbb9
parent17262e08af4e65a75484625417eb4ca0b916502e (diff)
downloadsrc-a140a745c4da50111b0b7ef995b4f0fc75eeca1a.tar.gz
src-a140a745c4da50111b0b7ef995b4f0fc75eeca1a.zip
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)
-rw-r--r--contrib/llvm-project/libcxx/src/atomic.cpp2
1 files changed, 1 insertions, 1 deletions
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)