diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-12 22:31:38 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-12 22:31:38 +0000 |
| commit | c52ff39e8ee052e4a57676d65a27f09bd0a859ad (patch) | |
| tree | 89b2ff9ba7308dcfd2ddabfd9abe301d9733aa49 /malloc | |
| parent | 2f5c1b000aaeb2c25b1df52453bba8de7f9453e2 (diff) | |
| download | glibc-c52ff39e8ee052e4a57676d65a27f09bd0a859ad.zip glibc-c52ff39e8ee052e4a57676d65a27f09bd0a859ad.tar.gz glibc-c52ff39e8ee052e4a57676d65a27f09bd0a859ad.tar.bz2 | |
Fix malloc_info namespace (bug 17570).
malloc_info is defined in the same file as malloc and free, but is not
an ISO C function, so should be a weak symbol. This patch makes it
so.
Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch).
[BZ #17570]
* malloc/malloc.c (malloc_info): Rename to __malloc_info and
define as weak alias of __malloc_info.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 6cbe9f3..6bfb859 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4993,7 +4993,7 @@ weak_alias (__posix_memalign, posix_memalign) int -malloc_info (int options, FILE *fp) +__malloc_info (int options, FILE *fp) { /* For now, at least. */ if (options != 0) @@ -5166,6 +5166,7 @@ malloc_info (int options, FILE *fp) return 0; } +weak_alias (__malloc_info, malloc_info) strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc) |