qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

localedef: Do not compile with mcheck 

__malloc_initialize_hook is deprecated.
This commit is contained in:
Florian Weimer 2016-05-11 16:56:59 +02:00
parent c64a10e544
commit 1ac3eaa6bc
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2016-05-11 Florian Weimer <fweimer@redhat.com>
Do not use mcheck in localedef.
* locale/programs/localedef.c (turn_on_mcheck)
(__malloc_initialize_hook): Remove.
2016-05-11 Stefan Liebler <stli@linux.vnet.ibm.com> 2016-05-11 Stefan Liebler <stli@linux.vnet.ibm.com>
* sysdeps/s390/s390-32/Makefile (pic-ccflag): Remove. * sysdeps/s390/s390-32/Makefile (pic-ccflag): Remove.

12
locale/programs/localedef.c
View File

@ -24,7 +24,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <libintl.h> #include <libintl.h>
#include <locale.h> #include <locale.h>
#include <mcheck.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -634,14 +633,3 @@ cannot open locale definition file `%s'"), result->name));
return result; return result;
} }
static void
turn_on_mcheck (void)
{
/* Enable `malloc' debugging. */
mcheck (NULL);
/* Use the following line for a more thorough but much slower testing. */
/* mcheck_pedantic (NULL); */
}
void (*__malloc_initialize_hook) (void) = turn_on_mcheck;