public inbox for libstdc++-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 r13-3237] libstdc++: Fix bootstrap for --disable-threads build [PR107221] Date: Tue, 11 Oct 2022 19:36:54 +0000 (GMT) [thread overview] Message-ID: <20221011193654.58FE33858D28@sourceware.org> (raw) https://gcc.gnu.org/g:23c3cbaed36f6d2f3a7a64f6ebda69329723514b commit r13-3237-g23c3cbaed36f6d2f3a7a64f6ebda69329723514b Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Oct 11 20:19:08 2022 +0100 libstdc++: Fix bootstrap for --disable-threads build [PR107221] The __scoped_lock type should be used unqualified so that we always refer to pool::__scoped_lock, which might be the dummy fallback implementation. The __mutex and __scoped_lock types in <ext/concurrence.h> already work fine without __GTHREADS being defined, but that header isn't included at all unless _GLIBCXX_HOSTED != 0. The fallback implementation should be used for ! _GLIBCXX_HOSTED instead of for !defined __GTHREADS. libstdc++-v3/ChangeLog: PR bootstrap/107221 * libsupc++/eh_alloc.cc (pool): Change preprocessor condition for using __mutex from __GTHREADS to _GLIBCXX_HOSTED. (pool::allocate): Remove namespace qualification to use pool::__scoped_lock instead of __gnu_cxx::__scoped_lock. Diff: --- libstdc++-v3/libsupc++/eh_alloc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc index 50dc37c0d9c..81b8a1548c6 100644 --- a/libstdc++-v3/libsupc++/eh_alloc.cc +++ b/libstdc++-v3/libsupc++/eh_alloc.cc @@ -145,7 +145,7 @@ namespace char data[] __attribute__((aligned)); }; -#ifdef __GTHREADS +#if _GLIBCXX_HOSTED // A single mutex controlling emergency allocations. __gnu_cxx::__mutex emergency_mutex; using __scoped_lock = __gnu_cxx::__scoped_lock; @@ -236,7 +236,7 @@ namespace void *pool::allocate (std::size_t size) noexcept { - __gnu_cxx::__scoped_lock sentry(emergency_mutex); + __scoped_lock sentry(emergency_mutex); // We need an additional size_t member plus the padding to // ensure proper alignment of data. size += offsetof (allocated_entry, data);
reply other threads:[~2022-10-11 19:36 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=20221011193654.58FE33858D28@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).