From 88677348b4de73874ca7d5a47451f42880f65f07 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Tue, 27 Dec 2022 18:11:42 -0300 Subject: Move libc_freeres_ptrs and libc_subfreeres to hidden/weak functions They are both used by __libc_freeres to free all library malloc allocated resources to help tooling like mtrace or valgrind with memory leak tracking. The current scheme uses assembly markers and linker script entries to consolidate the free routine function pointers in the RELRO segment and to be freed buffers in BSS. This patch changes it to use specific free functions for libc_freeres_ptrs buffers and call the function pointer array directly with call_function_static_weak. It allows the removal of both the internal macros and the linker script sections. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Carlos O'Donell --- intl/dcigettext.c | 3 ++- intl/finddomain.c | 2 +- intl/loadmsgcat.c | 1 - intl/localealias.c | 15 +++++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) (limited to 'intl') diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 64de9d511a..7886ac9545 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -1667,7 +1667,8 @@ mempcpy (void *dest, const void *src, size_t n) #ifdef _LIBC /* If we want to free all resources we have to do some work at program's end. */ -libc_freeres_fn (free_mem) +void +__intl_freemem (void) { void *old; diff --git a/intl/finddomain.c b/intl/finddomain.c index 5f2508b2ae..6a8b239a97 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -185,7 +185,7 @@ out: #ifdef _LIBC /* This is called from iconv/gconv_db.c's free_mem, as locales must be freed before freeing gconv steps arrays. */ -void __libc_freeres_fn_section +void _nl_finddomain_subfreeres (void) { struct loaded_l10nfile *runp = _nl_loaded_domains; diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 992489758c..94a362f923 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -1284,7 +1284,6 @@ _nl_load_domain (struct loaded_l10nfile *domain_file, #ifdef _LIBC void -__libc_freeres_fn_section _nl_unload_domain (struct loaded_domain *domain) { size_t i; diff --git a/intl/localealias.c b/intl/localealias.c index 42e4569b0a..ea4f48b594 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -126,14 +126,10 @@ struct alias_map }; -#ifndef _LIBC -# define libc_freeres_ptr(decl) decl -#endif - -libc_freeres_ptr (static char *string_space); +static char *string_space; static size_t string_space_act; static size_t string_space_max; -libc_freeres_ptr (static struct alias_map *map); +static struct alias_map *map; static size_t nmap; static size_t maxmap; @@ -439,3 +435,10 @@ alias_compare (const struct alias_map *map1, const struct alias_map *map2) return c1 - c2; #endif } + +void +__libc_localealias_freemem (void) +{ + free (string_space); + free (map); +} -- cgit 1.4.1