diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-02-08 19:58:43 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-02-15 11:01:23 +0100 |
| commit | 3a0ecccb599a6b1ad4b149dc569c0080e92d057b (patch) | |
| tree | e1c4c0e5f2e80221054d6bb6260b4038e27567b4 /include/malloc.h | |
| parent | 2efa52c880d46ee89523c8ed8102ceeb02043926 (diff) | |
| download | glibc-3a0ecccb599a6b1ad4b149dc569c0080e92d057b.zip glibc-3a0ecccb599a6b1ad4b149dc569c0080e92d057b.tar.gz glibc-3a0ecccb599a6b1ad4b149dc569c0080e92d057b.tar.bz2 | |
ld.so: Do not export free/calloc/malloc/realloc functions [BZ #25486]
Exporting functions and relying on symbol interposition from libc.so
makes the choice of implementation dependent on DT_NEEDED order, which
is not what some compiler drivers expect.
This commit replaces one magic mechanism (symbol interposition) with
another one (preprocessor-/compiler-based redirection). This makes
the hand-over from the minimal malloc to the full malloc more
explicit.
Removing the ABI symbols is backwards-compatible because libc.so is
always in scope, and the dynamic loader will find the malloc-related
symbols there since commit f0b2132b35248c1f4a80f62a2c38cddcc802aa8c
("ld.so: Support moving versioned symbols between sonames
[BZ #24741]").
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/malloc.h b/include/malloc.h index 70d32c7..0765482 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,7 +1,9 @@ #ifndef _MALLOC_H + #include <malloc/malloc.h> # ifndef _ISOMAC +# include <rtld-malloc.h> /* In the GNU libc we rename the global variable `__malloc_initialized' to `__libc_malloc_initialized'. */ |