Intercept _intel_fast_memcpy in the main executable. Partial fix for

#139667.

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

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index bccae755a4b7f41e16ec52c57819ade9afa6c7c3..aab3fa0d902addb73390fa44b771891c85bec773 100644 (file)
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -401,6 +401,15 @@ MEMCHR(m_libc_soname, memchr)
 
 MEMCPY(m_libc_soname, memcpy)
 MEMCPY(m_ld_so_1,     memcpy) /* ld.so.1 */
+/* icc9 blats these around all over the place.  Not only in the main
+   executable but various .so's.  They are highly tuned and read
+   memory beyond the source boundary (although work correctly and
+   never go across page boundaries), so give errors when run natively,
+   at least for misaligned source arg.  Just intercepting in the exe
+   only until we understand more about the problem.  See
+   http://bugs.kde.org/show_bug.cgi?id=139776
+ */
+MEMCPY(NONE, _intel_fast_memcpy)
 
 
 #define MEMCMP(soname, fnname) \