diff options
author | Christopher Faylor <me@cgf.cx> | 2006-06-02 04:09:50 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2006-06-02 04:09:50 +0400 |
commit | 2346864a451f0e82c26d083c1fee7c6df07edc68 (patch) | |
tree | 744e90adc1c975677be9e407f2fa86a8f0bfe2e3 /winsup/cygwin/cygtls.cc | |
parent | 3e1290a3053d973bacb7cd2f82124e5c2d0352a2 (diff) |
* cygheap.cc (cygheap_fixup_in_child): Don't close parent handle here. Let the
caller do that.
* dcrt0.cc (child_info_spawn::handle_spawn): Close parent handle here to allow
fixup_after_exec functions to use it.
* cygtls.cc (_cygtls::call2): Avoid calling exit thread if called with
*crt0_1 functions.
* cygtls.h (_cygtls::isinitialized): Check that we actually have a tls before
seeing if it is initialized.
* gendef (_sigfe_maybe): Ditto.
* dcrt0.cc (dll_crt0_1): Remove static, use just one argument.
* dll_init.cc (dllcrt0_info): New structure.
(dll_dllcrt0): Change into a front-end to renamed dll_dllcrt0_1 so that we'll
always be assured of having something like a tls.
(dll_dllcrt0_1): New function, basically renamed from from dll_dllcrt0.
Unconditionally call _my_tls.init_exception_handler now that we are assured of
having a tls. Change variable name from "linking" to "linked".
* winsup.h (dll_crt0_1): Declare.
(dll_dllcrt0_1): Ditto.
Diffstat (limited to 'winsup/cygwin/cygtls.cc')
-rw-r--r-- | winsup/cygwin/cygtls.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index 8dd15ad6e..e03175a1f 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -75,7 +75,8 @@ _cygtls::call2 (DWORD (*func) (void *, void *), void *arg, void *buf) remove (INFINITE); /* Don't call ExitThread on the main thread since we may have been dynamically loaded. */ - if (this != _main_tls) + if ((void *) func != (void *) dll_crt0_1 + && (void *) func != (void *) dll_dllcrt0_1) ExitThread (res); } |