|
From: <sv...@va...> - 2011-09-26 20:25:09
|
Author: sewardj Date: 2011-09-26 21:20:19 +0100 (Mon, 26 Sep 2011) New Revision: 12054 Log: arm_linux_android: intercept __dl_strcmp and __dl_strlen in /system/bin/linker, for the usual reason. Modified: trunk/memcheck/mc_replace_strmem.c Modified: trunk/memcheck/mc_replace_strmem.c =================================================================== --- trunk/memcheck/mc_replace_strmem.c 2011-09-26 20:18:29 UTC (rev 12053) +++ trunk/memcheck/mc_replace_strmem.c 2011-09-26 20:20:19 UTC (rev 12054) @@ -388,6 +388,9 @@ #if defined(VGO_linux) STRLEN(VG_Z_LIBC_SONAME, strlen) STRLEN(VG_Z_LIBC_SONAME, __GI_strlen) +# if defined(VGPV_arm_linux_android) + STRLEN(NONE, __dl_strlen); /* in /system/bin/linker */ +# endif #elif defined(VGO_darwin) //STRLEN(VG_Z_LIBC_SONAME, strlen) @@ -708,6 +711,9 @@ STRCMP(VG_Z_LIBC_SONAME, __GI_strcmp) STRCMP(VG_Z_LD_LINUX_X86_64_SO_2, strcmp) STRCMP(VG_Z_LD64_SO_1, strcmp) +# if defined(VGPV_arm_linux_android) + STRCMP(NONE, __dl_strcmp); /* in /system/bin/linker */ +# endif #elif defined(VGO_darwin) //STRCMP(VG_Z_LIBC_SONAME, strcmp) |