using malloc implementation types/macros/idioms for memalign

[oweals/musl.git] / src / exit / exit.c

diff --git a/src/exit/exit.c b/src/exit/exit.c
index 163d8f1b22a996d55230bcbf86d5c2890404684c..bf7835a15cd2d3ecf9d7d7c7e8e1dc25a62d2806 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -10,25 +10,25 @@ static void dummy()
  * as a consequence of linking either __toread.c or __towrite.c. */
 weak_alias(dummy, __funcs_on_exit);
 weak_alias(dummy, __stdio_exit);
-
-#ifndef SHARED
 weak_alias(dummy, _fini);
-extern void (*const __fini_array_start)() __attribute__((weak));
-extern void (*const __fini_array_end)() __attribute__((weak));
-#endif
 
-_Noreturn void exit(int code)
-{
-       __funcs_on_exit();
+__attribute__((__weak__, __visibility__("hidden")))
+extern void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
 
-#ifndef SHARED
+static void libc_exit_fini(void)
+{
        uintptr_t a = (uintptr_t)&__fini_array_end;
        for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)()))
                (*(void (**)())(a-sizeof(void(*)())))();
        _fini();
-#endif
+}
 
-       __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);
 }