diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2011-08-17 21:25:50 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2011-08-17 21:25:50 +0000 |
| commit | d88797f77eb2966b5438f5da9596e575a9105097 (patch) | |
| tree | f7a78f07986010bf1cdfd61c88a1d44c90cf9b5a /memcheck | |
| parent | 14127d6c4b16f2069d3ef6d4cc7f751bc01e4732 (diff) | |
Redirect memcpy@@GLIBC_2.14 differently from memcpy@GLIBC_2.2.5, so as
to retain overlap checks for the former whilst skipping them for the
latter. Pertains to #275284. (Tom Hughes, tom@compton.nu)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11988 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'memcheck')
| -rw-r--r-- | memcheck/mc_replace_strmem.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c index 9b8dba97..ff61a9cf 100644 --- a/memcheck/mc_replace_strmem.c +++ b/memcheck/mc_replace_strmem.c @@ -632,9 +632,9 @@ MEMCHR(VG_Z_DYLD, memchr) #define MEMMOVE_OR_MEMCPY(becTag, soname, fnname, do_ol_check) \ - void* VG_REPLACE_FUNCTION_EZU(becTag,soname,fnname) \ + void* VG_REPLACE_FUNCTION_EZZ(becTag,soname,fnname) \ ( void *dst, const void *src, SizeT len ); \ - void* VG_REPLACE_FUNCTION_EZU(becTag,soname,fnname) \ + void* VG_REPLACE_FUNCTION_EZZ(becTag,soname,fnname) \ ( void *dst, const void *src, SizeT len ) \ { \ if (do_ol_check && is_overlap(dst, src, len, len)) \ @@ -711,12 +711,13 @@ MEMCHR(VG_Z_DYLD, memchr) #if defined(VGO_linux) /* For older memcpy we have to use memmove-like semantics and skip the overlap check; sigh; see #275284. */ -MEMMOVE(VG_Z_LIBC_SONAME, memcpy) -MEMMOVE(VG_Z_LD_SO_1, memcpy) /* ld.so.1 */ -MEMMOVE(VG_Z_LD64_SO_1, memcpy) /* ld64.so.1 */ +MEMMOVE(VG_Z_LIBC_SONAME, memcpyZAGLIBCZu2Zd2Zd5) /* memcpy@GLIBC_2.2.5 */ +MEMCPY(VG_Z_LIBC_SONAME, memcpyZAZAGLIBCZu2Zd14) /* memcpy@@GLIBC_2.14 */ +MEMCPY(VG_Z_LD_SO_1, memcpy) /* ld.so.1 */ +MEMCPY(VG_Z_LD64_SO_1, memcpy) /* ld64.so.1 */ #elif defined(VGO_darwin) -MEMCPY(VG_Z_LIBC_SONAME, memcpy) -MEMCPY(VG_Z_DYLD, memcpy) +MEMCPY(VG_Z_LIBC_SONAME, memcpy) +MEMCPY(VG_Z_DYLD, memcpy) #endif /* icc9 blats these around all over the place. Not only in the main executable but various .so's. They are highly tuned and read @@ -726,7 +727,7 @@ MEMCPY(VG_Z_DYLD, memcpy) only until we understand more about the problem. See http://bugs.kde.org/show_bug.cgi?id=139776 */ -MEMCPY(NONE, _intel_fast_memcpy) +MEMCPY(NONE, ZuintelZufastZumemcpy) #define MEMCMP(soname, fnname) \ |