aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_db.c
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-12-27 18:11:42 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-03-27 13:57:55 -0300
commit88677348b4de73874ca7d5a47451f42880f65f07 (patch)
tree9ebe22b88c2487331521737dfdf089f9e3e2439f /iconv/gconv_db.c
parente4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff)
downloadglibc-88677348b4de73874ca7d5a47451f42880f65f07.tar
glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz
glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.bz2
glibc-88677348b4de73874ca7d5a47451f42880f65f07.zip
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 <carlos@redhat.com>
Diffstat (limited to 'iconv/gconv_db.c')
-rw-r--r--iconv/gconv_db.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index e9b1c07620..0ee8076287 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -169,7 +169,7 @@ add_derivation (const char *fromset, const char *toset,
not all memory will be freed. */
}
-static void __libc_freeres_fn_section
+static void
free_derivation (void *p)
{
struct known_derivation *deriv = (struct known_derivation *) p;
@@ -793,7 +793,6 @@ __gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
/* Free the modules mentioned. */
static void
-__libc_freeres_fn_section
free_modules_db (struct gconv_module *node)
{
if (node->left != NULL)
@@ -812,7 +811,8 @@ free_modules_db (struct gconv_module *node)
/* Free all resources if necessary. */
-libc_freeres_fn (free_mem)
+void
+__gconv_db_freemem (void)
{
/* First free locale memory. This needs to be done before freeing
derivations, as ctype cleanup functions dereference steps arrays which we