From 339000e89375b887151fbd5ce6fb121b2ce4bbdd Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Jul 07 2015 14:18:30 +0000
Subject: 3.10.1-13 Add valgrind-3.10.1-memmove-ld_so-ppc64.patch


---

diff --git a/valgrind-3.10.1-memmove-ld_so-ppc64.patch b/valgrind-3.10.1-memmove-ld_so-ppc64.patch
new file mode 100644
index 0000000..1293748
--- /dev/null
+++ b/valgrind-3.10.1-memmove-ld_so-ppc64.patch
@@ -0,0 +1,23 @@
+commit 6b5fb6710eaa4151e3aea77355d8fa3366312857
+Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Tue Jul 7 13:01:39 2015 +0000
+
+    349828 memcpy intercepts memmove causing src/dst overlap error (ppc64 ld.so)
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15397 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
+index d4e5449..0f366bf 100644
+--- a/shared/vg_replace_strmem.c
++++ b/shared/vg_replace_strmem.c
+@@ -1141,6 +1141,10 @@ static inline void my_exit ( int x )
+ #if defined(VGO_linux)
+  MEMMOVE(VG_Z_LIBC_SONAME, memmove)
+  MEMMOVE(VG_Z_LIBC_SONAME, __GI_memmove)
++ /* See bug #349828 Override for ld64.so.1 like memcpy, because for some
++    arches MEMCPY_OK_FOR_FORWARD_MEMMOVE is set, which might cause memmove
++    to call memcpy.  */
++ MEMMOVE(VG_Z_LD64_SO_1, memmove)
+ 
+ #elif defined(VGO_darwin)
+ # if DARWIN_VERS <= DARWIN_10_6
diff --git a/valgrind.spec b/valgrind.spec
index 2a2317d..6788f4e 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.10.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -104,9 +104,12 @@ Patch17: valgrind-3.10.1-cfi-redzone.patch
 # KDE#344499 Fix compilation for Linux kernel >= 4.
 Patch18: valgrind-3.10.1-kernel-4.0.patch
 
-# KDE#349941 VG_(di_notify_mmap) might create DebugInfoMapping with wrong segment start/size
+# KDE#349941 di_notify_mmap might create wrong start/size DebugInfoMapping
 Patch19: valgrind-3.10.1-di_notify_mmap.patch
 
+# KDE#349828 memcpy intercepts memmove causing src/dst overlap error
+Patch20: valgrind-3.10.1-memmove-ld_so-ppc64.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -224,6 +227,7 @@ Valgrind User Manual for details.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -379,8 +383,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
-* Mon Jul 06 2015 Mark Wielaard <mjw@redhat.com>
+* Tue Jul 07 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-13
 - Add valgrind-3.10.1-di_notify_mmap.patch
+- Add valgrind-3.10.1-memmove-ld_so-ppc64.patch
 
 * Fri Jun 19 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-12
 - Add valgrind-3.10.1-kernel-4.0.patch.