diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
| commit | bde2a94b61d1cef444d7d4b4b9db70062c48cf5d (patch) | |
| tree | 5393a8c666de2fb8995df1282909c09ed17d9351 /stdlib/cxa_thread_atexit_impl.c | |
| parent | 3f1ff80d9a0c60398e73d62c52f9a2f06af8d61d (diff) | |
| parent | 66986dec455c2011085a04b72a5bd55d9f9c7d1c (diff) | |
| download | glibc-ibm/2.19/master.tar glibc-ibm/2.19/master.tar.gz glibc-ibm/2.19/master.tar.bz2 glibc-ibm/2.19/master.zip | |
Merge branch 'release/2.19/master' into ibm/2.19/masteribm/2.19/master
Conflicts:
NEWS
Diffstat (limited to 'stdlib/cxa_thread_atexit_impl.c')
| -rw-r--r-- | stdlib/cxa_thread_atexit_impl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/stdlib/cxa_thread_atexit_impl.c b/stdlib/cxa_thread_atexit_impl.c index d2f88d3ed8..6030e5fc6f 100644 --- a/stdlib/cxa_thread_atexit_impl.c +++ b/stdlib/cxa_thread_atexit_impl.c @@ -42,6 +42,10 @@ static __thread struct link_map *lm_cache; int __cxa_thread_atexit_impl (dtor_func func, void *obj, void *dso_symbol) { +#ifdef PTR_MANGLE + PTR_MANGLE (func); +#endif + /* Prepend. */ struct dtor_list *new = calloc (1, sizeof (struct dtor_list)); new->func = func; @@ -83,9 +87,13 @@ __call_tls_dtors (void) while (tls_dtor_list) { struct dtor_list *cur = tls_dtor_list; - tls_dtor_list = tls_dtor_list->next; + dtor_func func = cur->func; +#ifdef PTR_DEMANGLE + PTR_DEMANGLE (func); +#endif - cur->func (cur->obj); + tls_dtor_list = tls_dtor_list->next; + func (cur->obj); __rtld_lock_lock_recursive (GL(dl_load_lock)); |