From: Julian Seward <jseward@acm.org>
Date: Mon, 26 Sep 2011 20:20:19 +0000 (+0000)
Subject: arm_linux_android: intercept __dl_strcmp and __dl_strlen in
X-Git-Tag: svn/VALGRIND_3_7_0~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef5296e4452c5b2aaf29bd93025d8701dcce6590;p=thirdparty%2Fvalgrind.git

arm_linux_android: intercept __dl_strcmp and __dl_strlen in
/system/bin/linker, for the usual reason.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12054
---

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index 1fdb7ebb39..b4ac8898dc 100644
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -388,6 +388,9 @@ static inline void my_exit ( int x )
 #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 @@ static inline void my_exit ( int x )
  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)