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

diff --git a/src/exit/exit.c b/src/exit/exit.c
index ae557c09..f259c982 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -2,29 +2,42 @@
 #include <unistd.h>
 #include <stdio.h>
 #include "libc.h"
+#include "atomic.h"
+#include "syscall.h"
 
 static void dummy()
 {
 }
 
-/* __towrite.c and atexit.c override these */
+/* __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)
+#ifndef SHARED
+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[2];
+	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 */
 	__funcs_on_exit();
-	__fflush_on_exit();
 
-	/* Destructor s**t is kept separate from atexit to avoid bloat */
-	if (libc.fini) libc.fini();
-	if (libc.ldso_fini) libc.ldso_fini();
+#ifndef SHARED
+	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();
 
 	_Exit(code);
 	for(;;);