From d12cb8e45232f11ee77f8b6d8cd71cc96fbff4a4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 2 Feb 2025 20:10:09 +0100 Subject: elf: Merge __dl_libc_freemem into __rtld_libc_freeres The functions serve very similar purposes. The advantage of __rtld_libc_freeres is that it is located within ld.so, so it is more natural to poke at link map internals there. This slightly regresses cleanup capabilities for statically linked binaries. If that becomes a problem, we should start calling __rtld_libc_freeres from __libc_freeres (perhaps after renaming it). --- malloc/set-freeres.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'malloc') diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c index c1809d3af7..2ac1df3c1c 100644 --- a/malloc/set-freeres.c +++ b/malloc/set-freeres.c @@ -28,7 +28,6 @@ # pragma weak __nss_module_freeres # pragma weak __nss_action_freeres # pragma weak __nss_database_freeres -# pragma weak __dl_libc_freemem # pragma weak __hdestroy # pragma weak __gconv_cache_freemem # pragma weak __gconv_conf_freemem @@ -136,7 +135,6 @@ __libc_freeres (void) _IO_cleanup (); /* We run the resource freeing after IO cleanup. */ - call_function_static_weak (__dl_libc_freemem); call_function_static_weak (__hdestroy); call_function_static_weak (__gconv_cache_freemem); call_function_static_weak (__gconv_conf_freemem); -- cgit v1.2.3