summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--locale/programs/localedef.c12
2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 7533a3d9de..8078217444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* sysdeps/s390/s390-32/Makefile (pic-ccflag): Remove.
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 6becd9aa2e..bfc5d22eae 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -24,7 +24,6 @@
#include <fcntl.h>
#include <libintl.h>
#include <locale.h>
-#include <mcheck.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@ -634,14 +633,3 @@ cannot open locale definition file `%s'"), result->name));
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;