summaryrefslogtreecommitdiffstats
path: root/libc/bionic/libc_init_static.c
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2009-07-21 15:25:23 -0700
committerAndy McFadden <fadden@android.com>2009-07-21 15:44:23 -0700
commit39f3745cf30efe38482ffead1c32f4e62f6fe32e (patch)
treec7ae2dcba7dd282d787961a641720dce723172ea /libc/bionic/libc_init_static.c
parentb56b5659b3996e98c2060f168d1cff1474e77d2a (diff)
downloadbionic-39f3745cf30efe38482ffead1c32f4e62f6fe32e.zip
bionic-39f3745cf30efe38482ffead1c32f4e62f6fe32e.tar.gz
bionic-39f3745cf30efe38482ffead1c32f4e62f6fe32e.tar.bz2
Restore malloc debug.
Some libc changes were preventing the initialization call from being made. The basic problem appears to be that libc_init_common.c is only built once, and it's only built for the non-debug libc.
Diffstat (limited to 'libc/bionic/libc_init_static.c')
-rw-r--r--libc/bionic/libc_init_static.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libc/bionic/libc_init_static.c b/libc/bionic/libc_init_static.c
index d097b6b..e6264bb 100644
--- a/libc/bionic/libc_init_static.c
+++ b/libc/bionic/libc_init_static.c
@@ -68,6 +68,12 @@ __noreturn void __libc_init(uintptr_t *elfdata,
/* Initialize the C runtime environment */
__libc_init_common(elfdata);
+#ifdef MALLOC_LEAK_CHECK
+ /* setup malloc leak checker, requires system properties */
+ extern void malloc_debug_init(void);
+ malloc_debug_init();
+#endif
+
/* Several Linux ABIs don't pass the onexit pointer, and the ones that
* do never use it. Therefore, we ignore it.
*/