From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 55B663850429; Mon, 29 Mar 2021 20:05:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 55B663850429 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9613] libstdc++: Fix to compile without gthreads X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: e5431137ca9787f6d8747c1d1c3f85f7b10fde35 X-Git-Newrev: 05defd6e5bd62285f13a096f447df4ee2e9981ef Message-Id: <20210329200504.55B663850429@sourceware.org> Date: Mon, 29 Mar 2021 20:05:04 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 20:05:04 -0000 https://gcc.gnu.org/g:05defd6e5bd62285f13a096f447df4ee2e9981ef commit r10-9613-g05defd6e5bd62285f13a096f447df4ee2e9981ef Author: Jonathan Wakely Date: Tue Aug 11 16:16:21 2020 +0100 libstdc++: Fix to compile without gthreads libstdc++-v3/ChangeLog: * include/std/stop_token: Check _GLIBCXX_HAS_GTHREADS using #ifdef instead of #if. (stop_token::_S_yield()): Check _GLIBCXX_HAS_GTHREADS before using __gthread_yield. (cherry picked from commit 35e5294c4b779f8fc24fdc86464f999867332995) Diff: --- libstdc++-v3/include/std/stop_token | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/stop_token b/libstdc++-v3/include/std/stop_token index 34b613e7c1a..90b967ec605 100644 --- a/libstdc++-v3/include/std/stop_token +++ b/libstdc++-v3/include/std/stop_token @@ -105,7 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { #if defined __i386__ || defined __x86_64__ __builtin_ia32_pause(); -#elif defined _GLIBCXX_USE_SCHED_YIELD +#elif defined _GLIBCXX_HAS_GTHREADS && defined _GLIBCXX_USE_SCHED_YIELD __gthread_yield(); #endif } @@ -162,7 +162,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION std::atomic _M_owners{1}; std::atomic _M_value{_S_ssrc_counter_inc}; _Stop_cb* _M_head = nullptr; -#if _GLIBCXX_HAS_GTHREADS +#ifdef _GLIBCXX_HAS_GTHREADS __gthread_t _M_requester; #endif @@ -237,7 +237,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } while (!_M_try_lock_and_stop(__old)); -#if _GLIBCXX_HAS_GTHREADS +#ifdef _GLIBCXX_HAS_GTHREADS #ifdef _GLIBCXX_NATIVE_THREAD_ID _M_requester = _GLIBCXX_NATIVE_THREAD_ID; #else @@ -270,7 +270,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (!__destroyed) { __cb->_M_destroyed = nullptr; -#if _GLIBCXX_HAS_GTHREADS +#ifdef _GLIBCXX_HAS_GTHREADS // synchronize with destructor of stop_callback that owns *__cb __cb->_M_done.release(); #endif @@ -347,7 +347,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Callback is not in the list, so must have been removed by a call to // _M_request_stop. -#if _GLIBCXX_HAS_GTHREADS +#ifdef _GLIBCXX_HAS_GTHREADS #ifdef _GLIBCXX_NATIVE_THREAD_ID auto __tid = _GLIBCXX_NATIVE_THREAD_ID; #else