From 25b18d8935a5ee933d5465f5db41ad58c26590f9 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 24 Jan 2023 12:03:45 +0200 Subject: [PATCH] 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)