remove __lock dependency from exit

[musl] / src / exit / exit.c

diff --git a/src/exit/exit.c b/src/exit/exit.c
index bfdb392..fc29148 100644 (file)
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -2,9 +2,14 @@
 #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()
+{
+}
+
+/* __towrite.c and atexit.c override these */
 weak_alias(dummy, __funcs_on_exit);
 weak_alias(dummy, __fflush_on_exit);
 
@@ -13,11 +18,11 @@ 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);
 
        /* 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);
+       __funcs_on_exit();
+       __fflush_on_exit();
 
        /* Destructor s**t is kept separate from atexit to avoid bloat */
        if (libc.fini) libc.fini();