simplify __stdio_exit static linking logic

[musl] / src / exit / exit.c

diff --git a/src/exit/exit.c b/src/exit/exit.c
index f259c98..27fb3e2 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -1,18 +1,15 @@
 #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);
 
 #ifndef SHARED
 weak_alias(dummy, _fini);
@@ -22,11 +19,6 @@ extern void (*const __fini_array_end)() __attribute__((weak));
 
 _Noreturn void exit(int code)
 {
-       static int lock;
-
-       /* If more than one thread calls exit, hang until _Exit ends it all */
-       while (a_swap(&lock, 1)) __syscall(SYS_pause);
-
        __funcs_on_exit();
 
 #ifndef SHARED
@@ -36,8 +28,7 @@ _Noreturn void exit(int code)
        _fini();
 #endif
 
-       __flush_on_exit();
-       __seek_on_exit();
+       __stdio_exit();
 
        _Exit(code);
        for(;;);