simplify __stdio_exit static linking logic

[musl] / src / exit / exit.c

diff --git a/src/exit/exit.c b/src/exit/exit.c
index e4aeaf1..27fb3e2 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -1,31 +1,34 @@
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <stdint.h>
 #include "libc.h"
-#include "atomic.h"
-#include "syscall.h"
 
 static void dummy()
 {
 }
 
-/* __toread.c, __towrite.c, and atexit.c override these */
+/* atexit.c and __stdio_exit.c override these. the latter is linked
+ * as a consequence of linking either __toread.c or __towrite.c. */
 weak_alias(dummy, __funcs_on_exit);
-weak_alias(dummy, __flush_on_exit);
-weak_alias(dummy, __seek_on_exit);
+weak_alias(dummy, __stdio_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;
+       __funcs_on_exit();
 
-       /* If more than one thread calls exit, hang until _Exit ends it all */
-       while (a_swap(&lock, 1)) __syscall(SYS_pause);
+#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
 
-       __funcs_on_exit();
-       if (libc.fini) libc.fini();
-       if (libc.ldso_fini) libc.ldso_fini();
-       __flush_on_exit();
-       __seek_on_exit();
+       __stdio_exit();
 
        _Exit(code);
        for(;;);