From 60a156ae53e976dfe44689f7c89e607596e7cf67 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 17 May 2021 14:55:22 +0100
Subject: [PATCH] libstdc++: Fix std::jthread assertion and re-enable skipped
 test

libstdc++-v3/ChangeLog:

	* include/std/thread (jthread::_S_create): Fix static assert
	message.
	* testsuite/30_threads/jthread/95989.cc: Re-enable test.
	* testsuite/30_threads/jthread/jthread.cc: Do not require
	pthread effective target.
	* testsuite/30_threads/jthread/2.cc: Moved to...
	* testsuite/30_threads/jthread/version.cc: ...here.
---
 libstdc++-v3/include/std/thread                                | 2 +-
 libstdc++-v3/testsuite/30_threads/jthread/95989.cc             | 1 -
 libstdc++-v3/testsuite/30_threads/jthread/jthread.cc           | 4 ++--
 libstdc++-v3/testsuite/30_threads/jthread/{2.cc => version.cc} | 0
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename libstdc++-v3/testsuite/30_threads/jthread/{2.cc => version.cc} (100%)

diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index 886994c..f51392a 100644
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -219,7 +219,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	  {
 	    static_assert(is_invocable_v<decay_t<_Callable>,
 					 decay_t<_Args>...>,
-			  "std::thread arguments must be invocable after"
+			  "std::jthread arguments must be invocable after"
 			  " conversion to rvalues");
 	    return thread{std::forward<_Callable>(__f),
 			  std::forward<_Args>(__args)...};
diff --git a/libstdc++-v3/testsuite/30_threads/jthread/95989.cc b/libstdc++-v3/testsuite/30_threads/jthread/95989.cc
index 53f9082..fb3f43b 100644
--- a/libstdc++-v3/testsuite/30_threads/jthread/95989.cc
+++ b/libstdc++-v3/testsuite/30_threads/jthread/95989.cc
@@ -20,7 +20,6 @@
 // { dg-require-gthreads {} }
 // { dg-additional-options "-pthread" { target pthread } }
 // { dg-additional-options "-static" { target static } }
-// { dg-skip-if "broken" { *-*-* } }
 
 #include <thread>
 
diff --git a/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc b/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc
index 6adc498..7997870 100644
--- a/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc
+++ b/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc
@@ -16,9 +16,9 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-options "-std=gnu++2a -pthread" }
-// { dg-add-options libatomic }
 // { dg-do run { target c++2a } }
-// { dg-require-effective-target pthread }
+// { dg-add-options libatomic }
+// { dg-additional-options "-pthread" { target pthread } }
 // { dg-require-gthreads "" }
 
 #include <thread>
diff --git a/libstdc++-v3/testsuite/30_threads/jthread/2.cc b/libstdc++-v3/testsuite/30_threads/jthread/version.cc
similarity index 100%
rename from libstdc++-v3/testsuite/30_threads/jthread/2.cc
rename to libstdc++-v3/testsuite/30_threads/jthread/version.cc
-- 
2.7.4