3.9.0-14.svn20140513r13961 valgrind-3.9.0-aarch64-glibc-2.19.90-gcc-4.9.patch

2014-05-15 19:50:34 +02:00 · 2014-05-15 19:50:34 +02:00 · 411e0723a4
commit 411e0723a4
parent af75891e83
2 changed files with 84 additions and 1 deletions
--- a/valgrind-3.9.0-aarch64-glibc-2.19.90-gcc-4.9.patch
+++ b/valgrind-3.9.0-aarch64-glibc-2.19.90-gcc-4.9.patch
@ -0,0 +1,77 @@
+commit 4e8ca2298aa12f10a40134f0aac161954597952e
+Author: sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Thu May 15 16:47:56 2014 +0000
+
+    Enable: sys_add_key, sys_keyctl, apparently needed by glibc-2.19.90 on
+    arm64-linux.
+    
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13972 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
+index b82b06b..c6de921 100644
+--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
+@@ -1024,6 +1024,8 @@ static SyscallTableEntry syscall_main_table[] = {
+    GENX_(__NR_brk,               sys_brk),               // 214
+    GENXY(__NR_munmap,            sys_munmap),            // 215
+    GENX_(__NR_mremap,            sys_mremap),            // 216
+   LINX_(__NR_add_key,           sys_add_key),           // 217
+   LINXY(__NR_keyctl,            sys_keyctl),            // 219
+    PLAX_(__NR_clone,             sys_clone),             // 220
+    GENX_(__NR_execve,            sys_execve),            // 221
+ 
+@@ -1342,9 +1344,7 @@ static SyscallTableEntry syscall_main_table[] = {
+ //ZZ    LINXY(__NR_msgrcv,            sys_msgrcv),         
+ //ZZ    LINXY(__NR_msgctl,            sys_msgctl),         // 304
+ //ZZ 
+-//ZZ    LINX_(__NR_add_key,           sys_add_key),        // 286
+ //ZZ    LINX_(__NR_request_key,       sys_request_key),    // 287
+-//ZZ    LINXY(__NR_keyctl,            sys_keyctl),         // not 288...
+ //ZZ //   LINX_(__NR_ioprio_set,        sys_ioprio_set),     // 289
+ //ZZ 
+ //ZZ //   LINX_(__NR_ioprio_get,        sys_ioprio_get),     // 290
+commit e013b24c6f62fda9836f5b0378573f1f7923ec8a
+Author: sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c>
+Date:   Thu May 15 16:49:21 2014 +0000
+
+    Initial front-end fixings needed to handle code generated by gcc-4.9
+    on arm64-linux.
+    
+    
+    git-svn-id: svn://svn.valgrind.org/vex/trunk@2862 8f6e269a-dfd6-0310-a8e1-e2731360e62c
+
+diff --git a/VEX/priv/guest_arm64_toIR.c b/VEX/priv/guest_arm64_toIR.c
+index 862eb20..85b2f2d 100644
+--- a/VEX/priv/guest_arm64_toIR.c
+++ b/VEX/priv/guest_arm64_toIR.c
+@@ -1004,6 +1004,8 @@ static IRExpr* getQRegLO ( UInt qregNo, IRType ty )
+ {
+    Int off = offsetQRegLane(qregNo, ty, 0);
+    switch (ty) {
+      case Ity_I8:
+      case Ity_I16:
+       case Ity_I32: case Ity_I64:
+       case Ity_F32: case Ity_F64: case Ity_V128:
+          break;
+@@ -7102,6 +7104,20 @@ Bool dis_ARM64_simd_and_fp(/*MB_OUT*/DisResult* dres, UInt insn)
+       /* else it's really an ORR; fall through. */
+    }
+ 
+   /* ---------------- CMEQ_d_d_#0 ---------------- */
+   /* 
+      010 11110 11 10000 0100 110 n d
+   */
+   if ((INSN(31,0) & 0xFFFFFC00) == 0x5EE09800) {
+      UInt nn = INSN(9,5);
+      UInt dd = INSN(4,0);
+      putQReg128(dd, unop(Iop_ZeroHI64ofV128,
+                          binop(Iop_CmpEQ64x2, getQReg128(nn),
+                                mkV128(0x0000))));
+      DIP("cmeq d%u, d%u, #0\n", dd, nn);
+      return True;
+   }
+
+    vex_printf("ARM64 front end: simd_and_fp\n");
+    return False;
+ #  undef INSN
--- a/valgrind.spec
+++ b/valgrind.spec
@ -6,7 +6,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.9.0
-Release: 13.svn%{?svn_date}r%{?svn_rev}%{?dist}
+Release: 14.svn%{?svn_date}r%{?svn_rev}%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@ -63,6 +63,8 @@ Patch6: valgrind-3.9.0-msghdr.patch
 # KDE#334727 - Build fails with -Werror=format-security
 Patch7: valgrind-3.9.0-format-security.patch

+Patch8: valgrind-3.9.0-aarch64-glibc-2.19.90-gcc-4.9.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
@ -169,6 +171,7 @@ Valgrind User Manual for details.

 %patch6 -p1
 %patch7 -p1
+%patch8 -p1

 %build
 # We need to use the software collection compiler and binutils if available.
@ -328,6 +331,9 @@ echo ===============END TESTING===============
 %endif

 %changelog
+* Tue May 15 2014 Mark Wielaard <mjw@redhat.com> 3.9.0-14.svn20140513r13961
+- Add valgrind-3.9.0-aarch64-glibc-2.19.90-gcc-4.9.patch
+
 * Tue May 13 2014 Mark Wielaard <mjw@redhat.com> 3.9.0-13.svn20140513r13961
 - Update to upstream svn r13961.
 - Remove valgrind-3.9.0-mpx.patch integrated upstream now.