From cb8031bcc05af04340ab98dc6f66884783951ef7 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Jul 31 2018 13:41:17 +0000
Subject: 3.13.0-25 - Add valgrind-3.13.0-x86-arch_prctl.patch (#1610304)


---

diff --git a/valgrind-3.13.0-x86-arch_prctl.patch b/valgrind-3.13.0-x86-arch_prctl.patch
new file mode 100644
index 0000000..09ed545
--- /dev/null
+++ b/valgrind-3.13.0-x86-arch_prctl.patch
@@ -0,0 +1,50 @@
+diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
+index bec145a..11bb13d 100644
+--- a/coregrind/m_syswrap/syswrap-x86-linux.c
++++ b/coregrind/m_syswrap/syswrap-x86-linux.c
+@@ -1604,7 +1604,10 @@ static SyscallTableEntry syscall_table[] = {
+    LINX_(__NR_sendmsg,           sys_sendmsg),          // 370
+    LINXY(__NR_recvfrom,          sys_recvfrom),         // 371
+    LINXY(__NR_recvmsg,           sys_recvmsg),          // 372
+-   LINX_(__NR_shutdown,          sys_shutdown)          // 373
++   LINX_(__NR_shutdown,          sys_shutdown),         // 373
++
++   /* Explicitly not supported on i386 yet. */
++   GENX_(__NR_arch_prctl,        sys_ni_syscall)        // 384
+ };
+ 
+ SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno )
+commit 12d162aabc8180d9ad0c095e72a1354e93b091d7
+Author: Tom Hughes <tom@compton.nu>
+Date:   Wed Mar 21 12:28:31 2018 +0000
+
+    Update linux system call numbers.
+
+diff --git a/include/vki/vki-scnums-x86-linux.h b/include/vki/vki-scnums-x86-linux.h
+index 8a6376b..041d247 100644
+--- a/include/vki/vki-scnums-x86-linux.h
++++ b/include/vki/vki-scnums-x86-linux.h
+@@ -32,7 +32,7 @@
+ #ifndef __VKI_SCNUMS_X86_LINUX_H
+ #define __VKI_SCNUMS_X86_LINUX_H
+ 
+-// Derived from linux-2.6/arch/x86/syscalls/syscall_32.tbl
++// Derived from linux-2.6/arch/x86/entry/syscalls/syscall_32.tbl
+ 
+ #define __NR_restart_syscall      0
+ #define __NR_exit		  1
+@@ -411,6 +411,14 @@
+ #define __NR_userfaultfd        374
+ #define __NR_membarrier         375
+ #define __NR_mlock2             376
++#define __NR_copy_file_range    377
++#define __NR_preadv2            378
++#define __NR_pwritev2           379
++#define __NR_pkey_mprotect      380
++#define __NR_pkey_alloc         381
++#define __NR_pkey_free          382
++#define __NR_statx              383
++#define __NR_arch_prctl         384
+ 
+ #endif /* __VKI_SCNUMS_X86_LINUX_H */
+ 
diff --git a/valgrind.spec b/valgrind.spec
index 080b859..9dfaab4 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.13.0
-Release: 24%{?dist}
+Release: 25%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -188,6 +188,9 @@ Patch23: valgrind-3.13.0-ld-separate-code.patch
 # KDE#396887 arch_prctl should return EINVAL on unknown option
 Patch24: valgrind-3.13.0-arch_prctl.patch
 
+# KDE#397012 glibc ld.so uses arch_prctl on i386
+Patch25: valgrind-3.13.0-x86-arch_prctl.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
@@ -332,6 +335,7 @@ Valgrind User Manual for details.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 %build
 CC=gcc
@@ -554,6 +558,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Tue Jul 31 2018 Mark Wielaard  <mjw@fedoraproject.org>  - 3.13.0-25
+- Add valgrind-3.13.0-x86-arch_prctl.patch (#1610304)
+
 * Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 3.13.0-24
 - Rebuild with fixed binutils