[arch-commits] Commit in valgrind/trunk (PKGBUILD add_xabort_op.patch)

[Anatol Pomozov]

    Date: Wednesday, September 3, 2014 @ 01:11:45
  Author: anatolik
Revision: 220916

upgpkg: valgrind 3.9.0-5

Added:
  valgrind/trunk/add_xabort_op.patch
Modified:
  valgrind/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    9 ++++++---
 add_xabort_op.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-02 23:00:21 UTC (rev 220915)
+++ PKGBUILD	2014-09-02 23:11:45 UTC (rev 220916)
@@ -4,7 +4,7 @@
 
 pkgname=valgrind
 pkgver=3.9.0
-pkgrel=4
+pkgrel=5
 pkgdesc='A tool to help find memory-management problems in programs'
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,13 +14,16 @@
 optdepends=('openmpi: MPI support')
 options=('staticlibs' '!emptydirs')
 source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-        valgrind-3.9.0-glibc-2.19.patch)
+        valgrind-3.9.0-glibc-2.19.patch
+        add_xabort_op.patch)
 sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
-          '4653e994d2660490c51a97cc70e45a506e80bfab')
+          '4653e994d2660490c51a97cc70e45a506e80bfab'
+          '126e90494e0134a70649456cd1a1f1369024c345')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.19.patch
+  patch -p0 -i "$srcdir"/add_xabort_op.patch  # FS#41696
 }
 
 build() {

Added: add_xabort_op.patch
===================================================================
--- add_xabort_op.patch	                        (rev 0)
+++ add_xabort_op.patch	2014-09-02 23:11:45 UTC (rev 220916)
@@ -0,0 +1,30 @@
+Index: VEX/priv/guest_amd64_toIR.c
+===================================================================
+--- VEX/priv/guest_amd64_toIR.c	(revision 2799)
++++ VEX/priv/guest_amd64_toIR.c	(revision 2800)
+@@ -20251,7 +20251,7 @@
+          return delta;
+       }
+       /* BEGIN HACKY SUPPORT FOR xbegin */
+-      if (modrm == 0xF8 && !have66orF2orF3(pfx) && sz == 4
++      if (opc == 0xC7 && modrm == 0xF8 && !have66orF2orF3(pfx) && sz == 4
+           && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX)) {
+          delta++; /* mod/rm byte */
+          d64 = getSDisp(4,delta); 
+@@ -20270,6 +20270,16 @@
+          return delta;
+       }
+       /* END HACKY SUPPORT FOR xbegin */
++      /* BEGIN HACKY SUPPORT FOR xabort */
++      if (opc == 0xC6 && modrm == 0xF8 && !have66orF2orF3(pfx) && sz == 1
++          && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX)) {
++         delta++; /* mod/rm byte */
++         abyte = getUChar(delta); delta++;
++         /* There is never a real transaction in progress, so do nothing. */
++         DIP("xabort $%d", (Int)abyte);
++         return delta;
++      }
++      /* END HACKY SUPPORT FOR xabort */
+       goto decode_failure;
+ 
+    case 0xC8: /* ENTER */