From: Petar Jovanovic <mips32r2@gmail.com>
Date: Fri, 5 May 2017 14:36:46 +0000 (+0000)
Subject: mips32: remove false warnings on Android
X-Git-Tag: svn/VALGRIND_3_13_0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8531fa9c3cb1cf3b8855119d23111288166b9f28;p=thirdparty%2Fvalgrind.git

mips32: remove false warnings on Android

Remove false warnings for strlen and strchr on Android.

Patch by Tamara Vlahovic.


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

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index f7de482059..21b4675261 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -1576,6 +1576,14 @@ void VG_(redir_initialise) ( void )
          (Addr)&VG_(mips32_linux_REDIR_FOR_index),
          complain_about_stripped_glibc_ldso
       );
+#  if defined(VGPV_mips32_linux_android)
+      add_hardwired_spec(
+         "NONE", "__dl_strlen",
+         (Addr)&VG_(mips32_linux_REDIR_FOR_strlen),
+         NULL
+      );
+#  endif
+
    }
 
 #  elif defined(VGP_mips64_linux)
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index 718515ecd4..74afa4b9ea 100644
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -254,6 +254,10 @@ static inline void my_exit ( int x )
   STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, index)
 # endif
 
+#if defined(VGPV_mips32_linux_android)
+  STRCHR(NONE,        __dl_strchr)
+#endif
+
 #elif defined(VGO_darwin)
  STRCHR(VG_Z_LIBC_SONAME, strchr)
 # if DARWIN_VERS == DARWIN_10_9