From 9fa8d227d41aaa7436b1065ca0a2922c0bf2dfa9 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 17 May 2006 03:36:14 +0000
Subject: * cygtls.cc (_cygtls::remove): Don't test for initialization since
 this function will always be called when _my_tls is initialized. * init.cc
 (dll_entry): Don't attempt to remove tls info if _my_tls is obviously not
 even available.

---
 winsup/cygwin/init.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'winsup/cygwin/init.cc')

diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index f73be7236..6a1575d15 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -156,7 +156,8 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
 	munge_threadfunc ();
       break;
     case DLL_THREAD_DETACH:
-      if (hwait_sig)
+      if (hwait_sig && (void *) &_my_tls > (void *) &wow64_test_stack_marker
+	  && _my_tls.isinitialized ())
 	_my_tls.remove (0);
       break;
     }
-- 
cgit v1.2.3