diff options
| author | Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> | 2022-12-27 18:11:42 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-03-27 13:57:55 -0300 |
| commit | 88677348b4de73874ca7d5a47451f42880f65f07 (patch) | |
| tree | 9ebe22b88c2487331521737dfdf089f9e3e2439f /locale | |
| parent | e4d336f1ace7c7ca535f7f85485373752bc76ed5 (diff) | |
| download | glibc-88677348b4de73874ca7d5a47451f42880f65f07.zip glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.gz glibc-88677348b4de73874ca7d5a47451f42880f65f07.tar.bz2 | |
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 'locale')
| -rw-r--r-- | locale/loadarchive.c | 2 | ||||
| -rw-r--r-- | locale/localeinfo.h | 4 | ||||
| -rw-r--r-- | locale/setlocale.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/locale/loadarchive.c b/locale/loadarchive.c index 454bbc7..5b857d5 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -498,7 +498,7 @@ _nl_load_locale_from_archive (int category, const char **namep) return lia->data[category]; } -void __libc_freeres_fn_section +void _nl_archive_subfreeres (void) { struct locale_in_archive *lia; diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 66cad7a..8bbf281 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -381,10 +381,10 @@ extern struct __locale_data *_nl_load_locale_from_archive (int category, const char **namep) attribute_hidden; -/* Subroutine of setlocale's __libc_subfreeres hook. */ +/* Subroutine of setlocale's free resource. */ extern void _nl_archive_subfreeres (void) attribute_hidden; -/* Subroutine of gconv-db's __libc_subfreeres hook. */ +/* Subroutine of gconv-db's free resource. */ extern void _nl_locale_subfreeres (void) attribute_hidden; /* Validate the contents of a locale file and set up the in-core diff --git a/locale/setlocale.c b/locale/setlocale.c index dd73fa4..6a902fa 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -468,7 +468,7 @@ setlocale (int category, const char *locale) } libc_hidden_def (setlocale) -static void __libc_freeres_fn_section +static void free_category (int category, struct __locale_data *here, struct __locale_data *c_data) { @@ -498,7 +498,7 @@ free_category (int category, /* 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_locale_subfreeres (void) { #ifdef NL_CURRENT_INDIRECT |