x86-linux: don't add redirections for strchr/index in ld.so since they

are already hardwiredly-redirected at startup, and so these are
redundant.

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

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index 42f8eceae5eaa66d9ea0361dcffae69a6fbb8c14..7e680f998720e818fb7be9779490ed1389674bba 100644 (file)
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -198,10 +198,12 @@ STRCHR(VG_Z_LIBC_SONAME,          strchr)
 STRCHR(VG_Z_LIBC_SONAME,          index)
 #if defined(VGO_linux)
 STRCHR(VG_Z_LIBC_SONAME,          __GI_strchr)
-STRCHR(VG_Z_LD_LINUX_SO_2,        strchr)
-STRCHR(VG_Z_LD_LINUX_SO_2,        index)
-STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, strchr)
-STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, index)
+#if !defined(VGP_x86_linux)
+ STRCHR(VG_Z_LD_LINUX_SO_2,        strchr)
+ STRCHR(VG_Z_LD_LINUX_SO_2,        index)
+ STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, strchr)
+ STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, index)
+#endif
 #elif defined(VGO_darwin)
 STRCHR(VG_Z_DYLD,                 strchr)
 STRCHR(VG_Z_DYLD,                 index)