summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2011-11-27 19:00:33 +0000
committerChristopher Faylor <me@cgf.cx>2011-11-27 19:00:33 +0000
commit0e5d7582d5dc06419bf2f51a31a779e7e3a0735c (patch)
tree070668eee1ffe506487c884a445668d1736ef57f
parent1b60bb36b0b115934bfce47f981e4c821ac3ea98 (diff)
downloadcygnal-0e5d7582d5dc06419bf2f51a31a779e7e3a0735c.tar.gz
cygnal-0e5d7582d5dc06419bf2f51a31a779e7e3a0735c.tar.bz2
cygnal-0e5d7582d5dc06419bf2f51a31a779e7e3a0735c.zip
* init.cc (dll_entry): Revert previous change since it caused inexplicable fork
problems.
-rw-r--r--winsup/cygwin/ChangeLog7
-rw-r--r--winsup/cygwin/init.cc1
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index cccc8b17d..41922169b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,6 +1,11 @@
+2011-11-27 Christopher Faylor <me.cygwin2011@cgf.cx>
+
+ * init.cc (dll_entry): Revert previous change since it caused
+ inexplicable fork problems.
+
2011-11-26 Christopher Faylor <me.cygwin2011@cgf.cx>
- * init.cc (remove): Don't bother calling through thread removal
+ * init.cc (dll_entry): Don't bother calling through thread removal
cleanup if we are exiting.
2011-11-26 Christopher Faylor <me.cygwin2011@cgf.cx>
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 480a41ea3..107d037f9 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -150,7 +150,6 @@ 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);