From c52ff39e8ee052e4a57676d65a27f09bd0a859ad Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 12 Nov 2014 22:31:38 +0000 Subject: [PATCH] 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. --- ChangeLog | 4 ++++ NEWS | 2 +- malloc/malloc.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42a3e82..b7ec0f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-11-12 Joseph Myers + [BZ #17570] + * malloc/malloc.c (malloc_info): Rename to __malloc_info and + define as weak alias of __malloc_info. + [BZ #17584] * dirent/rewinddir.c (rewinddir): Rename to __rewinddir and define as weak alias of __rewinddir. Don't use libc_hidden_def. diff --git a/NEWS b/NEWS index 63b0a86..5017517 100644 --- a/NEWS +++ b/NEWS @@ -11,7 +11,7 @@ Version 2.21 6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522, - 17555, 17583, 17584. + 17555, 17570, 17583, 17584. * New locales: tu_IN, bh_IN. 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) -- 2.7.4