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 bfdb392..f259c98 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -2,26 +2,42 @@
 #include <unistd.h>
 #include <stdio.h>
 #include "libc.h"
+#include "atomic.h"
+#include "syscall.h"
 
-/* __overflow.c and atexit.c override these */
-static int (*const dummy)() = 0;
+static void dummy()
+{
+}
+
+/* __toread.c, __towrite.c, and atexit.c override these */
 weak_alias(dummy, __funcs_on_exit);
-weak_alias(dummy, __fflush_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;
 
        /* If more than one thread calls exit, hang until _Exit ends it all */
-       LOCK(&lock);
+       while (a_swap(&lock, 1)) __syscall(SYS_pause);
+
+       __funcs_on_exit();
 
-       /* Only do atexit & stdio flush if they were actually used */
-       if (__funcs_on_exit) __funcs_on_exit();
-       if (__fflush_on_exit) __fflush_on_exit((void *)0);
+#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
 
-       /* Destructor s**t is kept separate from atexit to avoid bloat */
-       if (libc.fini) libc.fini();
-       if (libc.ldso_fini) libc.ldso_fini();
+       __flush_on_exit();
+       __seek_on_exit();
 
        _Exit(code);
        for(;;);