diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-12-03 05:21:55 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-12-03 05:21:55 +0000 |
| commit | d1eb7a4615a95da05f4bbc2e93e167b8afe6f0dc (patch) | |
| tree | c8259c647b2b6d0c356f01c8476268c2270dda51 /winsup/cygwin/dcrt0.cc | |
| parent | af9ef8abb2ad0423c20b28c5050a3b6e82d4e90c (diff) | |
| download | cygnal-d1eb7a4615a95da05f4bbc2e93e167b8afe6f0dc.tar.gz cygnal-d1eb7a4615a95da05f4bbc2e93e167b8afe6f0dc.tar.bz2 cygnal-d1eb7a4615a95da05f4bbc2e93e167b8afe6f0dc.zip | |
* cygthread.cc (cygthread::stub): Properly establish _threadinfo environment.
(cygthread::stub2): New function.
(cygthread::simplestub): Ditto.
(cygthread::simplestub2): New function.
* cygthread.h (cygthread::stub2): Declare new function.
(cygthread::simplestub2): Ditto.
* cygtls.h (_threadinfo::call): Declare new function.
(_threadinfo::call2): Ditto.
* dcrt0.cc (dll_crt0_1): Accommodate new _threadinfo::init which doesn't return
pointer to tls.
(_dll_crt0): Remove obsolete DECLARE_TLS_STORAGE.
(dll_crt0): Ditto.
* exceptions.cc (_threadinfo::call): New function.
(_threadinfo::call2): Ditto.
(_threadinfo::init): Don't return pointer.
* thread.cc (pthread::thread_init_wrapper): Properly establish _threadinfo
environment.
(pthread::thread_init_wrapper2): New function.
* thread.h (pthread::thread_init_wrapper): Remove noreturn attribute
(pthread::thread_init_wrapper2): Declare new function.
* winbase.h: Remove obsolete code.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 1ca549ec2..a0af0231b 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -532,8 +532,9 @@ _threadinfo NO_COPY *_main_tls; static void dll_crt0_1 () { - __uint64_t padding[CYGTLS_PADSIZE]; - _main_tls = _my_tls.init (padding); + char padding[CYGTLS_PADSIZE]; + _main_tls = &_my_tls; + _main_tls->init (padding); /* According to onno@stack.urc.tue.nl, the exception handler record must be on the stack. */ @@ -838,7 +839,6 @@ initial_env () extern "C" void __stdcall _dll_crt0 () { - DECLARE_TLS_STORAGE; initial_env (); char zeros[sizeof (fork_info->zero)] = {0}; static NO_COPY STARTUPINFO si; @@ -907,7 +907,6 @@ _dll_crt0 () void dll_crt0 (per_process *uptr) { - DECLARE_TLS_STORAGE; /* Set the local copy of the pointer into the user space. */ if (uptr && uptr != user_data) { |