|
From: <sv...@va...> - 2011-08-18 13:54:39
|
Author: sewardj Date: 2011-08-18 14:49:48 +0100 (Thu, 18 Aug 2011) New Revision: 11992 Log: 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. Modified: trunk/memcheck/mc_replace_strmem.c Modified: trunk/memcheck/mc_replace_strmem.c =================================================================== --- trunk/memcheck/mc_replace_strmem.c 2011-08-18 13:09:55 UTC (rev 11991) +++ trunk/memcheck/mc_replace_strmem.c 2011-08-18 13:49:48 UTC (rev 11992) @@ -198,10 +198,12 @@ 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) |