diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-10-11 20:19:08 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-10-11 20:36:09 +0100 |
| commit | 23c3cbaed36f6d2f3a7a64f6ebda69329723514b (patch) | |
| tree | c7bc5a6a395c9f78dcade0b3510261c058986ddb | |
| parent | 9736a42e1fb8df30d72cf28594d9046bf50200c1 (diff) | |
| download | gcc-23c3cbaed36f6d2f3a7a64f6ebda69329723514b.zip gcc-23c3cbaed36f6d2f3a7a64f6ebda69329723514b.tar.gz gcc-23c3cbaed36f6d2f3a7a64f6ebda69329723514b.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_alloc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/libsupc++/eh_alloc.cc b/libstdc++-v3/libsupc++/eh_alloc.cc index 50dc37c..81b8a15 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); |