AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-09 10:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix malloc_info namespace (bug 17570).

Browse Source 
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.
This commit is contained in:
Joseph Myers 2014-11-12 22:31:38 +00:00
parent 2f5c1b000a
commit c52ff39e8e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2014-11-12 Joseph Myers <joseph@codesourcery.com> 2014-11-12 Joseph Myers <joseph@codesourcery.com>
[BZ #17570]
* malloc/malloc.c (malloc_info): Rename to __malloc_info and
define as weak alias of __malloc_info.
[BZ #17584] [BZ #17584]
* dirent/rewinddir.c (rewinddir): Rename to __rewinddir and define * dirent/rewinddir.c (rewinddir): Rename to __rewinddir and define
as weak alias of __rewinddir. Don't use libc_hidden_def. as weak alias of __rewinddir. Don't use libc_hidden_def.

2
NEWS
View File

@ -11,7 +11,7 @@ Version 2.21
6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363, 6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
17555, 17583, 17584. 17555, 17570, 17583, 17584.
* New locales: tu_IN, bh_IN. * New locales: tu_IN, bh_IN.

3
malloc/malloc.c
View File

@ -4993,7 +4993,7 @@ weak_alias (__posix_memalign, posix_memalign)
int int
malloc_info (int options, FILE *fp) __malloc_info (int options, FILE *fp)
{ {
/* For now, at least. */ /* For now, at least. */
if (options != 0) if (options != 0)
@ -5166,6 +5166,7 @@ malloc_info (int options, FILE *fp)
return 0; return 0;
} }
weak_alias (__malloc_info, malloc_info)
strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc) strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc)