diff options
| author | Andy McFadden <fadden@android.com> | 2009-07-21 15:25:23 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2009-07-21 15:44:23 -0700 |
| commit | 39f3745cf30efe38482ffead1c32f4e62f6fe32e (patch) | |
| tree | c7ae2dcba7dd282d787961a641720dce723172ea /libc/bionic/libc_init_dynamic.c | |
| parent | b56b5659b3996e98c2060f168d1cff1474e77d2a (diff) | |
| download | bionic-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_dynamic.c')
| -rw-r--r-- | libc/bionic/libc_init_dynamic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c index b8e1078..b479b27 100644 --- a/libc/bionic/libc_init_dynamic.c +++ b/libc/bionic/libc_init_dynamic.c @@ -77,6 +77,13 @@ void __libc_prenit(void) tls_area[TLS_SLOT_BIONIC_PREINIT] = NULL; __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 + } __noreturn void __libc_init(uintptr_t *elfdata, |