aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--malloc/mcheck-init.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c10cb9fd22e..f860884e148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-10-16 Florian Weimer <fweimer@redhat.com>
+ [BZ #22050]
+ * malloc/mcheck-init.c (__malloc_initialize_hook): Use
+ compat_symbol_reference to access non-default version.
+
+2017-10-16 Florian Weimer <fweimer@redhat.com>
+
* malloc/Makefile (others-extras): Set to mcheck-init.o.
2017-10-16 Carlos O'Donell <carlos@redhat.com>
diff --git a/malloc/mcheck-init.c b/malloc/mcheck-init.c
index 6d2492ef7e4..05bf0324174 100644
--- a/malloc/mcheck-init.c
+++ b/malloc/mcheck-init.c
@@ -20,6 +20,7 @@
#include <malloc.h>
#include <mcheck.h>
+#include <shlib-compat.h>
static void
turn_on_mcheck (void)
@@ -28,3 +29,5 @@ turn_on_mcheck (void)
}
void (*__malloc_initialize_hook) (void) = turn_on_mcheck;
+compat_symbol_reference (libc, __malloc_initialize_hook,
+ __malloc_initialize_hook, GLIBC_2_0);