X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fexit%2Fexit.c;h=a6869b37594ea06585bdbffd5bb4e0e52c956234;hb=239c15565fe174a77cdd0a8226863a1da1880857;hp=695bdc0514f58a94428e65c559b9c45625f17de3;hpb=2e55da911896a91e95b24ab5dc8a9d9b0718f4de;p=musl

diff --git a/src/exit/exit.c b/src/exit/exit.c
index 695bdc05..a6869b37 100644
--- a/src/exit/exit.c
+++ b/src/exit/exit.c
@@ -6,31 +6,28 @@ 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)
-{
-	__funcs_on_exit();
+extern weak hidden 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(;;);
 }