add support for init/fini array in main program, and greatly simplify

[musl] / src / exit / exit.c

diff --git a/src/exit/exit.c b/src/exit/exit.c
index e4aeaf1..f259c98 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -14,7 +14,13 @@ weak_alias(dummy, __funcs_on_exit);
 weak_alias(dummy, __flush_on_exit);
 weak_alias(dummy, __seek_on_exit);
 
-void exit(int code)
+#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)
 {
        static int lock;
 
@@ -22,8 +28,14 @@ void exit(int code)
        while (a_swap(&lock, 1)) __syscall(SYS_pause);
 
        __funcs_on_exit();
-       if (libc.fini) libc.fini();
-       if (libc.ldso_fini) libc.ldso_fini();
+
+#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
+
        __flush_on_exit();
        __seek_on_exit();