diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-08-31 15:51:09 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-09-28 20:30:59 +0100 |
| commit | aeaea265cea3a2b2e772af7825351a4ceef29aac (patch) | |
| tree | 5a04fc109391cdcf3f5b15ffcb601367ee2c06e8 | |
| parent | bec11673c4349fb330d08f1147657aa7a49ce389 (diff) | |
| download | gcc-aeaea265cea3a2b2e772af7825351a4ceef29aac.zip gcc-aeaea265cea3a2b2e772af7825351a4ceef29aac.tar.gz gcc-aeaea265cea3a2b2e772af7825351a4ceef29aac.tar.bz2 | |
libstdc++: Define macro before it is first checked
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/bits/atomic_wait.h (_GLIBCXX_HAVE_PLATFORM_WAIT):
Define before first attempt to check it.
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_wait.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h index 07bb744..35c9264 100644 --- a/libstdc++-v3/include/bits/atomic_wait.h +++ b/libstdc++-v3/include/bits/atomic_wait.h @@ -56,9 +56,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX +#define _GLIBCXX_HAVE_PLATFORM_WAIT 1 using __platform_wait_t = int; static constexpr size_t __platform_wait_alignment = 4; #else +// define _GLIBCX_HAVE_PLATFORM_WAIT and implement __platform_wait() +// and __platform_notify() if there is a more efficient primitive supported +// by the platform (e.g. __ulock_wait()/__ulock_wake()) which is better than +// a mutex/condvar based wait. using __platform_wait_t = uint64_t; static constexpr size_t __platform_wait_alignment = __alignof__(__platform_wait_t); @@ -70,7 +75,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_HAVE_PLATFORM_WAIT = is_scalar_v<_Tp> && ((sizeof(_Tp) == sizeof(__detail::__platform_wait_t)) - && (alignof(_Tp*) >= __platform_wait_alignment)); + && (alignof(_Tp*) >= __detail::__platform_wait_alignment)); #else = false; #endif @@ -78,7 +83,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX -#define _GLIBCXX_HAVE_PLATFORM_WAIT 1 enum class __futex_wait_flags : int { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX_PRIVATE @@ -118,11 +122,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast<int>(__futex_wait_flags::__wake_private), __all ? INT_MAX : 1); } -#else -// define _GLIBCX_HAVE_PLATFORM_WAIT and implement __platform_wait() -// and __platform_notify() if there is a more efficient primitive supported -// by the platform (e.g. __ulock_wait()/__ulock_wake()) which is better than -// a mutex/condvar based wait #endif inline void @@ -331,7 +330,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if constexpr (__platform_wait_uses_type<_Up>) { - __val == __old; + __builtin_memcpy(&__val, &__old, sizeof(__val)); } else { |