X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fexit%2Fexit.c;h=bf7835a15cd2d3ecf9d7d7c7e8e1dc25a62d2806;hb=3c2cbbe7ba8b4486299ae0d5336ae01ab520d116;hp=d0c1bfc1d5b68a08873a367549ad09d4b310ea91;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=oweals%2Fmusl.git

diff --git a/src/exit/exit.c b/src/exit/exit.c
index d0c1bfc1..bf7835a1 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -1,28 +1,34 @@
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <stdint.h>
 #include "libc.h"
 
-/* __overflow.c and atexit.c override these */
-static int (*const dummy)() = 0;
-weak_alias(dummy, __funcs_on_exit);
-weak_alias(dummy, __fflush_on_exit);
-
-void exit(int code)
+static void dummy()
 {
-	static int lock;
+}
+
+/* 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, __stdio_exit);
+weak_alias(dummy, _fini);
 
-	/* If more than one thread calls exit, hang until _Exit ends it all */
-	LOCK(&lock);
+__attribute__((__weak__, __visibility__("hidden")))
+extern void (*const __fini_array_start)(void), (*const __fini_array_end)(void);
 
-	/* Only do atexit & stdio flush if they were actually used */
-	if (__funcs_on_exit) __funcs_on_exit();
-	if (__fflush_on_exit) __fflush_on_exit(0);
+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();
+}
 
-	/* Destructor s**t is kept separate from atexit to avoid bloat */
-	if (libc.fini) libc.fini();
-	if (libc.ldso_fini) libc.ldso_fini();
+weak_alias(libc_exit_fini, __libc_exit_fini);
 
+_Noreturn void exit(int code)
+{
+	__funcs_on_exit();
+	__libc_exit_fini();
+	__stdio_exit();
 	_Exit(code);
-	for(;;);
 }