* 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

@@ -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;
     }