From ad1cd43a86645ba2d4f7c8747240452a349d6bc1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 11 Nov 2015 22:08:23 -0500 Subject: unify static and dynamic libc init/fini code paths use weak definitions that the dynamic linker can override instead of preprocessor conditionals on SHARED so that the same libc start and exit code can be used for both static and dynamic linking. --- src/exit/exit.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/exit') diff --git a/src/exit/exit.c b/src/exit/exit.c index 163d8f1b..b391f338 100644 --- a/src/exit/exit.c +++ b/src/exit/exit.c @@ -11,24 +11,24 @@ static void dummy() weak_alias(dummy, __funcs_on_exit); weak_alias(dummy, __stdio_exit); -#ifndef SHARED -weak_alias(dummy, _fini); +extern void _fini() __attribute__((weak)); extern void (*const __fini_array_start)() __attribute__((weak)); extern void (*const __fini_array_end)() __attribute__((weak)); -#endif -_Noreturn void exit(int code) +static void libc_exit_fini(void) { - __funcs_on_exit(); - -#ifndef SHARED uintptr_t a = (uintptr_t)&__fini_array_end; for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)())) (*(void (**)())(a-sizeof(void(*)())))(); - _fini(); -#endif + if (_fini) _fini(); +} - __stdio_exit(); +weak_alias(libc_exit_fini, __libc_exit_fini); +_Noreturn void exit(int code) +{ + __funcs_on_exit(); + __libc_exit_fini(); + __stdio_exit(); _Exit(code); } -- cgit v1.2.1