X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fexit%2Fexit.c;h=e4932b5b229a9708e23a6e409082562da58f11ab;hp=bfdb3923fc98b6f515d8cab5cf90dcba7de1b4f6;hb=121e3a38a1d0b324696fc1671029e4b815ea7fa4;hpb=e3cd6c5c265cd481db6e0c5b529855d99f0bda30

diff --git a/src/exit/exit.c b/src/exit/exit.c
index bfdb3923..e4932b5b 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -2,26 +2,30 @@
 #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)
+_Noreturn void exit(int code)
 {
 	static int lock;
 
 	/* If more than one thread calls exit, hang until _Exit ends it all */
-	LOCK(&lock);
-
-	/* 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);
+	while (a_swap(&lock, 1)) __syscall(SYS_pause);
 
-	/* Destructor s**t is kept separate from atexit to avoid bloat */
+	__funcs_on_exit();
 	if (libc.fini) libc.fini();
 	if (libc.ldso_fini) libc.ldso_fini();
+	__flush_on_exit();
+	__seek_on_exit();
 
 	_Exit(code);
 	for(;;);