public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-3943] libstdc++: Define macro before it is first checked Date: Tue, 28 Sep 2021 19:31:27 +0000 (GMT) [thread overview] Message-ID: <20210928193127.D054F385842E@sourceware.org> (raw) https://gcc.gnu.org/g:aeaea265cea3a2b2e772af7825351a4ceef29aac commit r12-3943-gaeaea265cea3a2b2e772af7825351a4ceef29aac Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Aug 31 15:51:09 2021 +0100 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. Diff: --- libstdc++-v3/include/bits/atomic_wait.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h index 07bb744d822..35c92644146 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 {
reply other threads:[~2021-09-28 19:31 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210928193127.D054F385842E@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).