From 75404109dce57d2f8dac0f90808010233928418f Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 23 Jun 2021 11:05:51 +0100
Subject: [PATCH] libstdc++: Avoid "__lockable" name defined as macro by newlib

libstdc++-v3/ChangeLog:

	* include/std/mutex (__detail::__try_lock_impl): Rename
	parameter to avoid clashing with newlib's __lockable macro.
	(try_lock): Add 'inline' specifier.
	* testsuite/17_intro/names.cc: Add check for __lockable.
	* testsuite/30_threads/try_lock/5.cc: Add options for pthreads.
---
 libstdc++-v3/include/std/mutex                  | 6 +++---
 libstdc++-v3/testsuite/17_intro/names.cc        | 6 ++++++
 libstdc++-v3/testsuite/30_threads/try_lock/5.cc | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index c18ca1a..eeb51fd 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -517,9 +517,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     // Lock the last lockable, after all previous ones are locked.
     template<typename _Lockable>
       inline int
-      __try_lock_impl(_Lockable& __lockable)
+      __try_lock_impl(_Lockable& __l)
       {
-	if (unique_lock<_Lockable> __lock{__lockable, try_to_lock})
+	if (unique_lock<_Lockable> __lock{__l, try_to_lock})
 	  {
 	    __lock.release();
 	    return -1;
@@ -585,7 +585,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  Sequentially calls try_lock() on each argument.
    */
   template<typename _L1, typename _L2, typename... _L3>
-    int
+    inline int
     try_lock(_L1& __l1, _L2& __l2, _L3&... __l3)
     {
       return __detail::__try_lock_impl(__l1, __l2, __l3...);
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 624e3ed..534dab7 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
+// { dg-add-options no_pch }
 
 // Define macros for some common variables names that we must not use for
 // naming variables, parameters etc. in the library.
@@ -216,6 +217,11 @@
 #undef y
 #endif
 
+#if ! __has_include(<newlib.h>)
+// newlib's <sys/cdefs.h> defines __lockable as a macro, so we can't use it.
+# define __lockable		cannot be used as an identifier
+#endif
+
 #ifdef __sun__
 // See https://gcc.gnu.org/ml/libstdc++/2019-05/msg00175.html
 #undef ptr
diff --git a/libstdc++-v3/testsuite/30_threads/try_lock/5.cc b/libstdc++-v3/testsuite/30_threads/try_lock/5.cc
index a5574ff..b9ce1cc 100644
--- a/libstdc++-v3/testsuite/30_threads/try_lock/5.cc
+++ b/libstdc++-v3/testsuite/30_threads/try_lock/5.cc
@@ -1,4 +1,7 @@
-// { dg-do run { target c++11 } }
+// { dg-do run }
+// { dg-additional-options "-pthread" { target pthread } }
+// { dg-require-effective-target c++11 }
+// { dg-require-gthreads "" }
 
 #include <mutex>
 #include <testsuite_hooks.h>
-- 
2.7.4