diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 27316a096..d91dd4b6d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-12-07 Christopher Faylor <me.cygwin2011@cgf.cx> + + * exceptions.cc (ctrl_c_handler): Remove _my_tls.remove since it can + cause deadlocks during exec and will eventually be handled anyway. + 2011-12-07 Corinna Vinschen <vinschen@redhat.com> * spawn.cc (child_info_spawn::worker): Add CREATE_BREAKAWAY_FROM_JOB diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index c62b81662..019c585ef 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -937,8 +937,6 @@ ctrl_c_handler (DWORD type) ExitProcess (STATUS_CONTROL_C_EXIT); } - _my_tls.remove (INFINITE); - #if 0 if (type == CTRL_C_EVENT || type == CTRL_BREAK_EVENT) proc_subproc (PROC_KILLFORKED, 0); |