X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fexit%2Fexit.c;h=a6869b37594ea06585bdbffd5bb4e0e52c956234;hb=8ef9d46f4d0ff4f0073da6bee7ed0cb5f9035ead;hp=e4932b5b229a9708e23a6e409082562da58f11ab;hpb=c8ea985748a6857ac5db9ef50f9c92e2966c04d5;p=musl

diff --git a/src/exit/exit.c b/src/exit/exit.c
index e4932b5b..a6869b37 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -1,32 +1,33 @@
 #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);
+weak_alias(dummy, _fini);
 
-_Noreturn void exit(int code)
+extern weak hidden void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
+
+static void libc_exit_fini(void)
 {
-	static int lock;
+	uintptr_t a = (uintptr_t)&__fini_array_end;
+	for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)()))
+		(*(void (**)())(a-sizeof(void(*)())))();
+	_fini();
+}
 
-	/* If more than one thread calls exit, hang until _Exit ends it all */
-	while (a_swap(&lock, 1)) __syscall(SYS_pause);
+weak_alias(libc_exit_fini, __libc_exit_fini);
 
+_Noreturn void exit(int code)
+{
 	__funcs_on_exit();
-	if (libc.fini) libc.fini();
-	if (libc.ldso_fini) libc.ldso_fini();
-	__flush_on_exit();
-	__seek_on_exit();
-
+	__libc_exit_fini();
+	__stdio_exit();
 	_Exit(code);
-	for(;;);
 }