X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fexit%2Fexit.c;h=bf7835a15cd2d3ecf9d7d7c7e8e1dc25a62d2806;hb=15094943050eb9a564f409323070e50b40f78816;hp=f259c98278ed3f83edbb8672a1ccd838a429f241;hpb=7586360badcae6e73f04eb1b8189ce630281c4b2;p=musl

diff --git a/src/exit/exit.c b/src/exit/exit.c
index f259c982..bf7835a1 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -1,44 +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);
-
-#ifndef SHARED
+weak_alias(dummy, __stdio_exit);
 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;
-
-	/* If more than one thread calls exit, hang until _Exit ends it all */
-	while (a_swap(&lock, 1)) __syscall(SYS_pause);
 
-	__funcs_on_exit();
+__attribute__((__weak__, __visibility__("hidden")))
+extern void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
 
-#ifndef SHARED
+static void libc_exit_fini(void)
+{
 	uintptr_t a = (uintptr_t)&__fini_array_end;
 	for (; a>(uintptr_t)&__fini_array_start; a-=sizeof(void(*)()))
 		(*(void (**)())(a-sizeof(void(*)())))();
 	_fini();
-#endif
+}
 
-	__flush_on_exit();
-	__seek_on_exit();
+weak_alias(libc_exit_fini, __libc_exit_fini);
 
+_Noreturn void exit(int code)
+{
+	__funcs_on_exit();
+	__libc_exit_fini();
+	__stdio_exit();
 	_Exit(code);
-	for(;;);
 }