[arch-commits] Commit in valgrind-multilib/trunk (4 files)
Laurent Carlier
lcarlier at archlinux.org
Mon Sep 8 19:06:13 UTC 2014
Date: Monday, September 8, 2014 @ 21:06:13
Author: lcarlier
Revision: 118684
prepare glibc-2.20 rebuild
Added:
valgrind-multilib/trunk/add_xabort_op.patch
valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.20.patch
Modified:
valgrind-multilib/trunk/PKGBUILD
Deleted:
valgrind-multilib/trunk/valgrind-3.9.0-glibc-2.19.patch
---------------------------------+
PKGBUILD | 20 +++++++++++++-------
add_xabort_op.patch | 30 ++++++++++++++++++++++++++++++
valgrind-3.9.0-glibc-2.19.patch | 37 -------------------------------------
valgrind-3.9.0-glibc-2.20.patch | 37 +++++++++++++++++++++++++++++++++++++
4 files changed, 80 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-08 18:09:31 UTC (rev 118683)
+++ PKGBUILD 2014-09-08 19:06:13 UTC (rev 118684)
@@ -9,25 +9,31 @@
arch=('x86_64')
license=('GPL')
url="http://valgrind.org/"
-depends=('lib32-glibc>=2.19' 'lib32-glibc<2.20' 'perl')
-makedepends=('gdb' 'gcc-multilib')
+depends=('lib32-glibc>=2.20' 'lib32-glibc<2.21' 'perl')
+makedepends=('gdb' 'openmpi' 'gcc-multilib')
+optdepends=('openmpi: MPI support')
options=('staticlibs' '!emptydirs')
provides=('valgrind')
conflicts=('valgrind')
source=(http://valgrind.org/downloads/valgrind-${pkgver}.tar.bz2
- valgrind-3.9.0-glibc-2.19.patch)
-md5sums=('0947de8112f946b9ce64764af7be6df2'
- '21020338ad5a93e6f9694946183e8835')
+ valgrind-3.9.0-glibc-2.19.patch
+ add_xabort_op.patch)
+sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
+ '2080c3d44de20857f18b03a93404a8f3d3721f7e'
+ '126e90494e0134a70649456cd1a1f1369024c345')
prepare() {
cd ${srcdir}/valgrind-${pkgver}
- patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
+ patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch
+ patch -p0 -i "$srcdir"/add_xabort_op.patch
}
build() {
cd ${srcdir}/valgrind-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --with-mpicc=mpicc
make
}
Added: add_xabort_op.patch
===================================================================
--- add_xabort_op.patch (rev 0)
+++ add_xabort_op.patch 2014-09-08 19:06:13 UTC (rev 118684)
@@ -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 */
Deleted: valgrind-3.9.0-glibc-2.19.patch
===================================================================
--- valgrind-3.9.0-glibc-2.19.patch 2014-09-08 18:09:31 UTC (rev 118683)
+++ valgrind-3.9.0-glibc-2.19.patch 2014-09-08 19:06:13 UTC (rev 118684)
@@ -1,37 +0,0 @@
-diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000
-+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
-@@ -6689,6 +6689,16 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.19)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
-+$as_echo "2.19 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
-+
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
- darwin)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000
-+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000
-@@ -918,6 +918,13 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.19)
-+ AC_MSG_RESULT(2.19 family)
-+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
- darwin)
- AC_MSG_RESULT(Darwin)
- AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
Added: valgrind-3.9.0-glibc-2.20.patch
===================================================================
--- valgrind-3.9.0-glibc-2.20.patch (rev 0)
+++ valgrind-3.9.0-glibc-2.20.patch 2014-09-08 19:06:13 UTC (rev 118684)
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.20)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5
++$as_echo "2.20 family" >&6; }
++
++$as_echo "#define GLIBC_2_20 1" >>confdefs.h
++
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.20)
++ AC_MSG_RESULT(2.20 family)
++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
More information about the arch-commits
mailing list