generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Register __libc_fini as early as possible.

Browse Source 
We want __libc_fini to be called after all the destructors.

Bug: 14611536
Change-Id: Ibb83a94436795ec178fd605fa531ac29608f4a3e
This commit is contained in:
Dmitriy Ivanov
2014-09-03 14:56:05 -07:00
parent 3b10ba6f1b
commit e880c736d6
6 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libc/bionic/libc_init_static.cpp
View File

@@ -61,6 +61,9 @@
extern "C" int __cxa_atexit(void (*)(void *), void *, void *);
__attribute__ ((section (".fini_array")))
void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
static void call_array(void(**list)()) {
// First element is -1, list is null-terminated
while (*++list) {
@@ -99,14 +102,13 @@ __noreturn void __libc_init(void* raw_args,
// do never use it. Therefore, we ignore it.
call_array(structors->preinit_array);
call_array(structors->init_array);
// The executable may have its own destructors listed in its .fini_array
// so we need to ensure that these are called when the program exits
// normally.
if (structors->fini_array != NULL) {
__cxa_atexit(__libc_fini,structors->fini_array,NULL);
}
__cxa_atexit(__libc_fini,&__FINI_ARRAY__, NULL);
call_array(structors->init_array);
exit(slingshot(args.argc, args.argv, args.envp));
}