lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Avoid unconditional __call_tls_dtors calls in static linking.

Browse Source
This commit is contained in:
Roland McGrath
2013-03-28 16:52:57 -07:00
parent 288f7d79fe
commit e57b0c6100
6 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2013-03-28 Roland McGrath <roland@hack.frob.com>
* csu/libc-start.c (__libc_start_main) [!SHARED]: If _dl_aux_init * csu/libc-start.c (__libc_start_main) [!SHARED]: If _dl_aux_init

8
include/stdlib.h
View File

@ -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, extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg,
void *d); void *d);
extern void __call_tls_dtors (void); extern void __call_tls_dtors (void)
libc_hidden_proto (__call_tls_dtors); #ifndef SHARED
__attribute__ ((weak))
#endif
;
libc_hidden_proto (__call_tls_dtors)
extern void __cxa_finalize (void *d); extern void __cxa_finalize (void *d);

5
nptl/ChangeLog
View File

@ -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> 2013-03-19 Siddhesh Poyarekar <siddhesh@redhat.com>
* allocatestack.c (allocate_stack): Use __default_pthread_attr * allocatestack.c (allocate_stack): Use __default_pthread_attr

5
nptl/pthread_create.c
View File

@ -312,7 +312,10 @@ start_thread (void *arg)
} }
/* Call destructors for the thread_local TLS variables. */ /* 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. */ /* Run the destructor for the thread-local data. */
__nptl_deallocate_tsd (); __nptl_deallocate_tsd ();

2
stdlib/cxa_thread_atexit_impl.c
View File

@ -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 /* 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 void
__call_tls_dtors (void) __call_tls_dtors (void)
{ {

5
stdlib/exit.c
View File

@ -34,7 +34,10 @@ __run_exit_handlers (int status, struct exit_function_list **listp,
bool run_list_atexit) bool run_list_atexit)
{ {
/* First, call the TLS destructors. */ /* 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 /* We do it this way to handle recursive calls to exit () made by
the functions registered with `atexit' and `on_exit'. We call the functions registered with `atexit' and `on_exit'. We call