From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 15 Feb 2021 15:35:55 +0000 (+0000)
Subject: libstdc++: Fix __thread_yield for non-gthreads targets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc9a0a3d79d6abb08753a819c9ea21a25015e962;p=gcc.git

libstdc++: Fix __thread_yield for non-gthreads targets

The __gthread_yield() function is only defined for gthreads targets, so
check _GLIBCXX_HAS_GTHREADS before using it.

Also reorder __thread_relax and __thread_yield so that the former can
use the latter instead of repeating the same preprocessor checks.

libstdc++-v3/ChangeLog:

	* include/bits/atomic_wait.h (__thread_yield()): Check
	_GLIBCXX_HAS_GTHREADS before using __gthread_yield.
	(__thread_relax()): Use __thread_yield() instead of repeating
	the preprocessor checks for __gthread_yield.
---

diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h
index 1a0f0943ebd..37085ae8e50 100644
--- a/libstdc++-v3/include/bits/atomic_wait.h
+++ b/libstdc++-v3/include/bits/atomic_wait.h
@@ -214,23 +214,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     };
 
     inline void
-    __thread_relax() noexcept
+    __thread_yield() noexcept
     {
-#if defined __i386__ || defined __x86_64__
-      __builtin_ia32_pause();
-#elif defined _GLIBCXX_USE_SCHED_YIELD
-      __gthread_yield();
+#if defined _GLIBCXX_HAS_GTHREADS && defined _GLIBCXX_USE_SCHED_YIELD
+     __gthread_yield();
 #endif
     }
 
     inline void
-    __thread_yield() noexcept
+    __thread_relax() noexcept
     {
-#if defined _GLIBCXX_USE_SCHED_YIELD
-     __gthread_yield();
+#if defined __i386__ || defined __x86_64__
+      __builtin_ia32_pause();
+#else
+      __gthread_yield();
 #endif
     }
-
   } // namespace __detail
 
   template<typename _Pred>