diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-01-18 21:15:05 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-01-19 00:58:21 +0000 |
| commit | c3861f79859d96777f86a24261fe639538fd2e1c (patch) | |
| tree | c3b10095322d8b1e32c51dd05da50af262f35511 | |
| parent | 7a761ae658967dab59dca691373e3ea10707217a (diff) | |
| download | gcc-c3861f79859d96777f86a24261fe639538fd2e1c.zip gcc-c3861f79859d96777f86a24261fe639538fd2e1c.tar.gz gcc-c3861f79859d96777f86a24261fe639538fd2e1c.tar.bz2 | |
libstdc++: Fix std::atomic<std::shared_ptr<T>> for AIX [PR104101]
This fixes an on AIX.
The lock function currently just spins, which should be changed to use
back-off, and maybe then _M_val.wait(__current) when supported.
libstdc++-v3/ChangeLog:
PR libstdc++/104101
* include/bits/shared_ptr_atomic.h (_Sp_atomic::_Atomic_count::lock):
Only use __thread_relax if __cpp_lib_atomic_wait is defined.
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_atomic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/shared_ptr_atomic.h b/libstdc++-v3/include/bits/shared_ptr_atomic.h index 50aa463..35f781d 100644 --- a/libstdc++-v3/include/bits/shared_ptr_atomic.h +++ b/libstdc++-v3/include/bits/shared_ptr_atomic.h @@ -392,7 +392,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION auto __current = _M_val.load(memory_order_relaxed); while (__current & _S_lock_bit) { +#if __cpp_lib_atomic_wait __detail::__thread_relax(); +#endif __current = _M_val.load(memory_order_relaxed); } @@ -401,7 +403,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __o, memory_order_relaxed)) { +#if __cpp_lib_atomic_wait __detail::__thread_relax(); +#endif __current = __current & ~_S_lock_bit; } return reinterpret_cast<pointer>(__current); |