From: Julian Seward Date: Wed, 11 Apr 2012 08:46:53 +0000 (+0000) Subject: Android's libc includes advertise a "malloc_usable_size", but the X-Git-Tag: svn/VALGRIND_3_8_0~362 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fd4b24eef8fdb3d08b50de29b36c698819c705c;p=thirdparty%2Fvalgrind.git Android's libc includes advertise a "malloc_usable_size", but the libc.so contains no such symbol; rather a "dlmalloc_usable_size" (great, huh :-) So intercept that too, on Android. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12498 --- diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c index 3953911909..af6c29b3c1 100644 --- a/coregrind/m_replacemalloc/vg_replace_malloc.c +++ b/coregrind/m_replacemalloc/vg_replace_malloc.c @@ -863,6 +863,9 @@ static void init(void); #if defined(VGO_linux) MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_usable_size); MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_size); +# if defined(VGPV_arm_linux_android) + MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, dlmalloc_usable_size); +# endif #elif defined(VGO_darwin) //MALLOC_USABLE_SIZE(VG_Z_LIBC_SONAME, malloc_usable_size);