public inbox for
help / color / mirror / Atom feed
* [gcc r13-3237] libstdc++: Fix bootstrap for --disable-threads build [PR107221]
@ 2022-10-11 19:36 Jonathan Wakely
  0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2022-10-11 19:36 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

commit r13-3237-g23c3cbaed36f6d2f3a7a64f6ebda69329723514b
Author: Jonathan Wakely <>
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
    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.
            PR bootstrap/107221
            * libsupc++/ (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.

 libstdc++-v3/libsupc++/ | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/libsupc++/ b/libstdc++-v3/libsupc++/
index 50dc37c0d9c..81b8a1548c6 100644
--- a/libstdc++-v3/libsupc++/
+++ b/libstdc++-v3/libsupc++/
@@ -145,7 +145,7 @@ namespace
 	char data[] __attribute__((aligned));
-#ifdef __GTHREADS
       // 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);

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-10-11 19:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11 19:36 [gcc r13-3237] libstdc++: Fix bootstrap for --disable-threads build [PR107221] Jonathan Wakely

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).