public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] stdlib: Move _IO_cleanup to call_function_static_weak
@ 2022-12-12 12:59 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2022-12-12 12:59 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5dcd2d0ad02ff12c76355ef4f40947c1857ac482
commit 5dcd2d0ad02ff12c76355ef4f40947c1857ac482
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Sun Nov 13 15:49:27 2022 -0300
stdlib: Move _IO_cleanup to call_function_static_weak
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diff:
---
Makerules | 3 ---
libio/genops.c | 2 --
stdlib/exit.c | 6 ++----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makerules b/Makerules
index a41491429e..3226b7a12b 100644
--- a/Makerules
+++ b/Makerules
@@ -568,9 +568,6 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
PROVIDE(__start___libc_subfreeres = .);\
__libc_subfreeres : { *(__libc_subfreeres) }\
PROVIDE(__stop___libc_subfreeres = .);\
- PROVIDE(__start___libc_atexit = .);\
- __libc_atexit : { *(__libc_atexit) }\
- PROVIDE(__stop___libc_atexit = .);\
PROVIDE(__start___libc_IO_vtables = .);\
__libc_IO_vtables : { *(__libc_IO_vtables) }\
PROVIDE(__stop___libc_IO_vtables = .);\
diff --git a/libio/genops.c b/libio/genops.c
index 1b629eb695..8a7fc4f7c5 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -1115,5 +1115,3 @@ _IO_list_resetlock (void)
#endif
}
libc_hidden_def (_IO_list_resetlock)
-
-text_set_element(__libc_atexit, _IO_cleanup);
diff --git a/stdlib/exit.c b/stdlib/exit.c
index 10c44e1449..98579fbda8 100644
--- a/stdlib/exit.c
+++ b/stdlib/exit.c
@@ -20,11 +20,9 @@
#include <unistd.h>
#include <pointer_guard.h>
#include <libc-lock.h>
+#include <libio/libioP.h>
#include "exit.h"
-#include "set-hooks.h"
-DEFINE_HOOK (__libc_atexit, (void))
-
/* Initialize the flag that indicates exit function processing
is complete. See concurrency notes in stdlib/exit.h where
__exit_funcs_lock is declared. */
@@ -128,7 +126,7 @@ __run_exit_handlers (int status, struct exit_function_list **listp,
__libc_lock_unlock (__exit_funcs_lock);
if (run_list_atexit)
- RUN_HOOK (__libc_atexit, ());
+ call_function_static_weak (_IO_cleanup);
_exit (status);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-12 12:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-12 12:59 [glibc] stdlib: Move _IO_cleanup to call_function_static_weak Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).