Avoid unconditional __call_tls_dtors calls in static linking.
This commit is contained in:
parent
288f7d79fe
commit
e57b0c6100
|
@ -1,3 +1,10 @@
|
|||
2013-03-28 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* include/stdlib.h [!SHARED] (__call_tls_dtors):
|
||||
Declare with __attribute__ ((weak)).
|
||||
* stdlib/exit.c (__libc_atexit) [!SHARED]:
|
||||
Call __call_tls_dtors only if it's not NULL.
|
||||
|
||||
2013-03-28 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* csu/libc-start.c (__libc_start_main) [!SHARED]: If _dl_aux_init
|
||||
|
|
|
@ -102,8 +102,12 @@ extern int __cxa_atexit_internal (void (*func) (void *), void *arg, void *d)
|
|||
|
||||
extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg,
|
||||
void *d);
|
||||
extern void __call_tls_dtors (void);
|
||||
libc_hidden_proto (__call_tls_dtors);
|
||||
extern void __call_tls_dtors (void)
|
||||
#ifndef SHARED
|
||||
__attribute__ ((weak))
|
||||
#endif
|
||||
;
|
||||
libc_hidden_proto (__call_tls_dtors)
|
||||
|
||||
extern void __cxa_finalize (void *d);
|
||||
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2013-03-28 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* pthread_create.c (start_thread) [!SHARED]:
|
||||
Call __call_tls_dtors only if it's not NULL.
|
||||
|
||||
2013-03-19 Siddhesh Poyarekar <siddhesh@redhat.com>
|
||||
|
||||
* allocatestack.c (allocate_stack): Use __default_pthread_attr
|
||||
|
|
|
@ -312,7 +312,10 @@ start_thread (void *arg)
|
|||
}
|
||||
|
||||
/* Call destructors for the thread_local TLS variables. */
|
||||
__call_tls_dtors ();
|
||||
#ifndef SHARED
|
||||
if (&__call_tls_dtors != NULL)
|
||||
#endif
|
||||
__call_tls_dtors ();
|
||||
|
||||
/* Run the destructor for the thread-local data. */
|
||||
__nptl_deallocate_tsd ();
|
||||
|
|
|
@ -76,7 +76,7 @@ __cxa_thread_atexit_impl (dtor_func func, void *obj, void *dso_symbol)
|
|||
}
|
||||
|
||||
/* Call the destructors. This is called either when a thread returns from the
|
||||
initial function or when the process exits via the exit(3) function. */
|
||||
initial function or when the process exits via the exit function. */
|
||||
void
|
||||
__call_tls_dtors (void)
|
||||
{
|
||||
|
|
|
@ -34,7 +34,10 @@ __run_exit_handlers (int status, struct exit_function_list **listp,
|
|||
bool run_list_atexit)
|
||||
{
|
||||
/* First, call the TLS destructors. */
|
||||
__call_tls_dtors ();
|
||||
#ifndef SHARED
|
||||
if (&__call_tls_dtors != NULL)
|
||||
#endif
|
||||
__call_tls_dtors ();
|
||||
|
||||
/* We do it this way to handle recursive calls to exit () made by
|
||||
the functions registered with `atexit' and `on_exit'. We call
|
||||
|
|
Loading…
Reference in New Issue