diff options
| -rw-r--r-- | ldso/ldso/ldso.c | 8 | ||||
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 10 | ||||
| -rw-r--r-- | libc/stdlib/atexit.c | 8 |
3 files changed, 23 insertions, 3 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index db250f0be..f6ac50905 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -766,11 +766,13 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr, #ifdef _DL_FINI_CRT_COMPAT /* arches that have moved their ldso FINI handling should skip this part */ { - int (*_dl_atexit) (void *) = (int (*)(void *)) (intptr_t) _dl_find_hash("atexit", + void (*__set__dl_fini) (void *) = (void (*)(void *)) (intptr_t) _dl_find_hash("_set__dl_fini", _dl_symbol_tables, NULL, ELF_RTYPE_CLASS_PLT); - if (_dl_atexit) - (*_dl_atexit) (_dl_fini); + if (__set__dl_fini) + (*__set__dl_fini)(_dl_fini); + else + _dl_if_debug_dprint("_set__dl_fini not found\n"); } #endif diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 6f74e39e8..53bb02820 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -161,6 +161,16 @@ void attribute_hidden (*__app_fini)(void) = NULL; void attribute_hidden (*__rtld_fini)(void) = NULL; +#ifdef _DL_FINI_CRT_COMPAT +void attribute_hidden (*__dl_fini)(void) = NULL; + +void _set__dl_fini(void *fini_func) +{ + if (fini_func != NULL) + __dl_fini = fini_func; +} +#endif + /* __uClibc_start_main is the new main stub for uClibc. This function is * called from crt0 (version 0.9.16 or newer), after ALL shared libraries * are initialized, just before we call the application's main function. diff --git a/libc/stdlib/atexit.c b/libc/stdlib/atexit.c index 280f42cb7..c70318148 100644 --- a/libc/stdlib/atexit.c +++ b/libc/stdlib/atexit.c @@ -223,6 +223,11 @@ extern void (*__app_fini)(void); #endif extern void (*__rtld_fini)(void); + +#ifdef _DL_FINI_CRT_COMPAT +extern void (*__dl_fini)(void); +#endif + /* * Normal program termination */ @@ -242,6 +247,9 @@ void exit(int rv) #ifndef _DL_FINI_CRT_COMPAT if (__rtld_fini != NULL) (__rtld_fini)(); +#else + if (__dl_fini != NULL) + (__dl_fini)(); #endif /* If we are using stdio, try to shut it down. At the very least, |