* init.cc (remove): Don't bother calling through thread removal cleanup if we

are exiting.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 32482a3..cccc8b1 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-26  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
+       * init.cc (remove): Don't bother calling through thread removal
+       cleanup if we are exiting.
+
+2011-11-26  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
        * exceptions.cc (stackdump): Make global.
        (signal_exit): Move to sigproc.cc.
        * sigproc.cc (signal_exit): Move here.  Declare stackdump extern.  Set

diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 107d037..480a41e 100644 (file)
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -150,6 +150,7 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
       break;
     case DLL_THREAD_DETACH:
       if (dll_finished_loading
+         && exit_state < ES_FINAL
          && (PVOID) &_my_tls > (PVOID) &wow64_test_stack_marker
          && _my_tls.isinitialized ())
        _my_tls.remove (0);