* thread.cc (pthread::exit): Create dummy tls structure to hold _main_tls

contents if we've asked _main_tls to exit.

1 files changed, 10 insertions, 1 deletions

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 389c8fda3..953e0c9f8 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -517,7 +517,16 @@ pthread::exit (void *value_ptr)
   if (InterlockedDecrement (&MT_INTERFACE->threadcount) == 0)
     ::exit (0);
   else
-    ExitThread (0);
+    {
+      if (cygtls == _main_tls)
+	{
+	  _cygtls *dummy = (_cygtls *) malloc (sizeof (_cygtls));
+	  *dummy = *_main_tls;
+	  _main_tls = dummy;
+	  _main_tls->initialized = false;
+	}
+      ExitThread (0);
+    }
 }
 
 int