[arch-commits] Commit in valgrind/trunk (3 files)
Date: Tuesday, September 29, 2015 @ 14:25:19
Author: anatolik
Revision: 247889
upgpkg: valgrind 3.11.0-1
Do not use Arch buildflags. Valgrind build script disable stack protector
flags, but CFLAGS overwrite it and causes compile error.
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/valgrind-glibc.patch
valgrind/trunk/valgrind-kernel-version.patch
---+
PKGBUILD | 19 ++-
valgrind-glibc.patch | 69
valgrind-kernel-version.patch | 47 ---
3 files changed, 5 insertions(+), 130 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-09-29 12:18:39 UTC (rev 247888)
+++ PKGBUILD2015-09-29 12:25:19 UTC (rev 247889)
@@ -10,22 +10,13 @@
license=(GPL)
url='http://valgrind.org/'
depends=('glibc>=2.22' 'glibc<2.23' 'perl')
-makedepends=('gdb' 'openmpi')
+makedepends=(gdb openmpi)
optdepends=('openmpi: MPI support')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-valgrind-glibc.patch
- valgrind-kernel-version.patch)
-sha1sums=('340757e91d9e83591158fe8bb985c6b11bc53de5'
- '1fa127ef24630ad5f4901ea0e37ea2acb12d3d17'
- '08b71e1ebc3e3906d0ff273db0aba2177a857c47')
+# valgrind does not like stack protector flags
+options=(!emptydirs !buildflags)
+source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2)
+sha1sums=('340757e91d9e83591158fe8bb985c6b11bc53de5')
-prepare() {
- cd $pkgname-$pkgver
-# patch -p1 -i "$srcdir"/valgrind-glibc.patch
-# patch -p1 -i "$srcdir"/valgrind-kernel-version.patch
-}
-
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc
Deleted: valgrind-glibc.patch
===
--- valgrind-glibc.patch2015-09-29 12:18:39 UTC (rev 247888)
+++ valgrind-glibc.patch2015-09-29 12:25:19 UTC (rev 247889)
@@ -1,69 +0,0 @@
-From 8e520f21445e7c376c2606826affb20be92bfe8d Mon Sep 17 00:00:00 2001
-From: Anatol Pomozov
-Date: Thu, 6 Aug 2015 09:04:44 -0700
-Subject: [PATCH 1/2] glibc
-
- configure| 20
- configure.ac | 14 ++
- 2 files changed, 34 insertions(+)
-
-diff --git a/configure b/configure
-index 78ddf3e..6ab06b3 100755
a/configure
-+++ b/configure
-@@ -6842,6 +6842,26 @@ $as_echo "#define GLIBC_2_20 1" >>confdefs.h
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.21)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.21 family" >&5
-+$as_echo "2.21 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_21 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}"
-+ ;;
-+ 2.22)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.22 family" >&5
-+$as_echo "2.22 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_22 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 --git a/configure.ac b/configure.ac
-index 0fd2a41..7f389c2 100644
a/configure.ac
-+++ b/configure.ac
-@@ -1018,6 +1018,20 @@ case "${GLIBC_VERSION}" in
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.21)
-+ AC_MSG_RESULT(2.21 family)
-+ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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}"
-+ ;;
-+ 2.22)
-+ AC_MSG_RESULT(2.22 family)
-+ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.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])
---
-2.5.0
-
Deleted: valgrind-kernel-version.patch
===
--- valgrind-kernel-version.patch 2015-09-29 12:18:39 UTC (rev 247888)
+++ valgrind-kernel-version.patch 2015-09-29 12:25:19 UTC (rev 247889)
@@ -1,47 +0,0 @@
-From 88d02c44361bf4d9b354eea7e20559a4a57b866f Mon Sep 17 00:00:00 2001
-From: Anatol
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Sunday, February 8, 2015 @ 03:19:47
Author: allan
Revision: 231118
upgpkg: valgrind 3.10.1-2
glibc-2.21 rebuild
Added:
valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch
(from rev 231117, valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch)
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch
-+
PKGBUILD| 12
valgrind-3.9.0-glibc-2.20.patch | 37 --
valgrind-3.9.0-glibc-2.21.patch | 54 ++
3 files changed, 60 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-08 01:50:29 UTC (rev 231117)
+++ PKGBUILD2015-02-08 02:19:47 UTC (rev 231118)
@@ -4,23 +4,23 @@
pkgname=valgrind
pkgver=3.10.1
-pkgrel=1
+pkgrel=2
pkgdesc='A tool to help find memory-management problems in programs'
arch=(i686 x86_64)
license=(GPL)
url='http://valgrind.org/'
-depends=('glibc=2.20' 'glibc2.21' 'perl')
+depends=('glibc=2.21' 'glibc2.22' 'perl')
makedepends=('gdb' 'openmpi')
optdepends=('openmpi: MPI support')
-options=('staticlibs' '!emptydirs')
+options=('!emptydirs')
source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-valgrind-3.9.0-glibc-2.20.patch)
+valgrind-3.9.0-glibc-2.21.patch)
sha1sums=('15518427de842547ffa84eff8b2b67f3b16581a8'
- '2080c3d44de20857f18b03a93404a8f3d3721f7e')
+ 'f1740a5b03c69baee4aa0cefb27315d6b5ec6699')
prepare() {
cd $pkgname-$pkgver
- patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.20.patch
+ patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.21.patch
}
build() {
Deleted: valgrind-3.9.0-glibc-2.20.patch
===
--- valgrind-3.9.0-glibc-2.20.patch 2015-02-08 01:50:29 UTC (rev 231117)
+++ valgrind-3.9.0-glibc-2.20.patch 2015-02-08 02:19:47 UTC (rev 231118)
@@ -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.0 +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.0 +1000
-+++ valgrind-3.9.0/configure.ac2014-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])
Copied: valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch (from rev 231117,
valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch)
===
--- valgrind-3.9.0-glibc-2.21.patch (rev 0)
+++ valgrind-3.9.0-glibc-2.21.patch 2015-02-08 02:19:47 UTC (rev 231118)
@@ -0,0 +1,54 @@
+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.0 +1000
valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,26 @@
+ 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}
++ ;;
++ 2.21)
++ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.21 family 5
++$as_echo 2.21 family 6; }
++
++$as_echo #define GLIBC_2_21 1 confdefs.h
++
++ DEFAULT_SUPP=glibc-2.X.supp ${DEFAULT_SUPP}
++ DEFAULT_SUPP=glibc-2.34567-NPTL-helgrind.supp
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Thursday, September 11, 2014 @ 17:44:06
Author: anatolik
Revision: 221430
upgpkg: valgrind 3.10.0-1
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/add_bnd_prefix_support.patch
valgrind/trunk/add_xabort_op.patch
--+
PKGBUILD | 16 --
add_bnd_prefix_support.patch | 234 -
add_xabort_op.patch | 37 --
3 files changed, 5 insertions(+), 282 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-11 13:14:07 UTC (rev 221429)
+++ PKGBUILD2014-09-11 15:44:06 UTC (rev 221430)
@@ -3,8 +3,8 @@
# Maintainer: Allan McRae al...@archlinux.org
pkgname=valgrind
-pkgver=3.9.0
-pkgrel=7
+pkgver=3.10.0
+pkgrel=1
pkgdesc='A tool to help find memory-management problems in programs'
arch=(i686 x86_64)
license=(GPL)
@@ -14,19 +14,13 @@
optdepends=('openmpi: MPI support')
options=('staticlibs' '!emptydirs')
source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-valgrind-3.9.0-glibc-2.20.patch
-add_xabort_op.patch
-add_bnd_prefix_support.patch)
-sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
- '2080c3d44de20857f18b03a93404a8f3d3721f7e'
- '34e90bb5e6355fea796952de7cb270b49567874d'
- '074b60ab54ed9ff502660a9b544ff31303358a29')
+valgrind-3.9.0-glibc-2.20.patch)
+sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26'
+ '2080c3d44de20857f18b03a93404a8f3d3721f7e')
prepare() {
cd $pkgname-$pkgver
patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.20.patch
- patch -p0 -i $srcdir/add_xabort_op.patch # FS#41696
- patch -p0 -i $srcdir/add_bnd_prefix_support.patch
}
build() {
Deleted: add_bnd_prefix_support.patch
===
--- add_bnd_prefix_support.patch2014-09-11 13:14:07 UTC (rev 221429)
+++ add_bnd_prefix_support.patch2014-09-11 15:44:06 UTC (rev 221430)
@@ -1,234 +0,0 @@
-
-r2858 | mjw | 2014-05-09 04:41:06 -0700 (Fri, 09 May 2014) | 6 lines
-
-Recognize MPX instructions and bnd prefix. Bug #333666.
-
-Recognize and parse operands of new MPX instructions BNDMK, BNDCL,
-BNDCU, BNDCN, BNDMOV, BNDLDX and BNDSTX. Also recognize bnd (F2) prefix
-for CALL (E8,FF/2), RET (C2,C3), JMP (EB,E9,FF/4) and Jcc (70-7F,0F 80-8F).
-All new MPX instructions are currently NOPs and the bnd prefix is ignored.
-
-
-Index: VEX/priv/guest_amd64_toIR.c
-===
VEX/priv/guest_amd64_toIR.c(revision 2857)
-+++ VEX/priv/guest_amd64_toIR.c(revision 2858)
-@@ -767,10 +767,10 @@
- return toBool( ! haveNo66noF2noF3(pfx) );
- }
-
--/* Return True iff pfx has 66 or F2 set */
--static Bool have66orF2 ( Prefix pfx )
-+/* Return True iff pfx has 66 or F3 set */
-+static Bool have66orF3 ( Prefix pfx )
- {
-- return toBool((pfx (PFX_66|PFX_F2)) 0);
-+ return toBool((pfx (PFX_66|PFX_F3)) 0);
- }
-
- /* Clear all the segment-override bits in a prefix. */
-@@ -4266,8 +4266,12 @@
-
-modrm = getUChar(delta);
-if (epartIsReg(modrm)) {
-- /* F2/XACQ and F3/XREL are always invalid in the non-mem case. */
-- if (haveF2orF3(pfx)) goto unhandledR;
-+ /* F2/XACQ and F3/XREL are always invalid in the non-mem case.
-+ F2/CALL and F2/JMP may have bnd prefix. */
-+ if (haveF2orF3(pfx)
-+ ! (haveF2(pfx)
-+(gregLO3ofRM(modrm) == 2 || gregLO3ofRM(modrm) == 4)))
-+goto unhandledR;
- assign(t1, getIRegE(sz,pfx,modrm));
- switch (gregLO3ofRM(modrm)) {
- case 0: /* INC */
-@@ -4287,6 +4291,7 @@
- case 2: /* call Ev */
- /* Ignore any sz value and operate as if sz==8. */
- if (!(sz == 4 || sz == 8)) goto unhandledR;
-+if (haveF2(pfx)) DIP(bnd ; ); /* MPX bnd prefix. */
- sz = 8;
- t3 = newTemp(Ity_I64);
- assign(t3, getIRegE(sz,pfx,modrm));
-@@ -4302,6 +4307,7 @@
- case 4: /* jmp Ev */
- /* Ignore any sz value and operate as if sz==8. */
- if (!(sz == 4 || sz == 8)) goto unhandledR;
-+if (haveF2(pfx)) DIP(bnd ; ); /* MPX bnd prefix. */
- sz = 8;
- t3 = newTemp(Ity_I64);
- assign(t3, getIRegE(sz,pfx,modrm));
-@@ -4334,11 +4340,14 @@
-showSz ? nameISize(sz) : ' ',
-nameIRegE(sz, pfx, modrm));
-} else {
-- /* Decide if F2/XACQ or F3/XREL might be valid. */
-+ /* Decide if F2/XACQ, F3/XREL, F2/CALL or F2/JMP might be valid. */
- Bool validF2orF3 = haveF2orF3(pfx) ? False : True;
- if ((gregLO3ofRM(modrm) == 0/*INC*/ || gregLO3ofRM(modrm) == 1/*DEC*/)
-haveF2orF3(pfx) !haveF2andF3(pfx) haveLOCK(pfx)) {
- validF2orF3 =
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Wednesday, September 10, 2014 @ 18:14:36
Author: anatolik
Revision: 221384
upgpkg: valgrind 3.9.0-7
Add patch for BND prefix support. Fixes issue with glibc-2.20 that uses these
CPU operations.
Added:
valgrind/trunk/add_bnd_prefix_support.patch
Modified:
valgrind/trunk/PKGBUILD
valgrind/trunk/add_xabort_op.patch
--+
PKGBUILD |9 +
add_bnd_prefix_support.patch | 234 +
add_xabort_op.patch |7 +
3 files changed, 247 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-10 12:32:26 UTC (rev 221383)
+++ PKGBUILD2014-09-10 16:14:36 UTC (rev 221384)
@@ -4,7 +4,7 @@
pkgname=valgrind
pkgver=3.9.0
-pkgrel=6
+pkgrel=7
pkgdesc='A tool to help find memory-management problems in programs'
arch=(i686 x86_64)
license=(GPL)
@@ -15,15 +15,18 @@
options=('staticlibs' '!emptydirs')
source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
valgrind-3.9.0-glibc-2.20.patch
-add_xabort_op.patch)
+add_xabort_op.patch
+add_bnd_prefix_support.patch)
sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
'2080c3d44de20857f18b03a93404a8f3d3721f7e'
- '126e90494e0134a70649456cd1a1f1369024c345')
+ '34e90bb5e6355fea796952de7cb270b49567874d'
+ '074b60ab54ed9ff502660a9b544ff31303358a29')
prepare() {
cd $pkgname-$pkgver
patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.20.patch
patch -p0 -i $srcdir/add_xabort_op.patch # FS#41696
+ patch -p0 -i $srcdir/add_bnd_prefix_support.patch
}
build() {
Added: add_bnd_prefix_support.patch
===
--- add_bnd_prefix_support.patch(rev 0)
+++ add_bnd_prefix_support.patch2014-09-10 16:14:36 UTC (rev 221384)
@@ -0,0 +1,234 @@
+
+r2858 | mjw | 2014-05-09 04:41:06 -0700 (Fri, 09 May 2014) | 6 lines
+
+Recognize MPX instructions and bnd prefix. Bug #333666.
+
+Recognize and parse operands of new MPX instructions BNDMK, BNDCL,
+BNDCU, BNDCN, BNDMOV, BNDLDX and BNDSTX. Also recognize bnd (F2) prefix
+for CALL (E8,FF/2), RET (C2,C3), JMP (EB,E9,FF/4) and Jcc (70-7F,0F 80-8F).
+All new MPX instructions are currently NOPs and the bnd prefix is ignored.
+
+
+Index: VEX/priv/guest_amd64_toIR.c
+===
+--- VEX/priv/guest_amd64_toIR.c(revision 2857)
VEX/priv/guest_amd64_toIR.c(revision 2858)
+@@ -767,10 +767,10 @@
+ return toBool( ! haveNo66noF2noF3(pfx) );
+ }
+
+-/* Return True iff pfx has 66 or F2 set */
+-static Bool have66orF2 ( Prefix pfx )
++/* Return True iff pfx has 66 or F3 set */
++static Bool have66orF3 ( Prefix pfx )
+ {
+- return toBool((pfx (PFX_66|PFX_F2)) 0);
++ return toBool((pfx (PFX_66|PFX_F3)) 0);
+ }
+
+ /* Clear all the segment-override bits in a prefix. */
+@@ -4266,8 +4266,12 @@
+
+modrm = getUChar(delta);
+if (epartIsReg(modrm)) {
+- /* F2/XACQ and F3/XREL are always invalid in the non-mem case. */
+- if (haveF2orF3(pfx)) goto unhandledR;
++ /* F2/XACQ and F3/XREL are always invalid in the non-mem case.
++ F2/CALL and F2/JMP may have bnd prefix. */
++ if (haveF2orF3(pfx)
++ ! (haveF2(pfx)
++(gregLO3ofRM(modrm) == 2 || gregLO3ofRM(modrm) == 4)))
++goto unhandledR;
+ assign(t1, getIRegE(sz,pfx,modrm));
+ switch (gregLO3ofRM(modrm)) {
+ case 0: /* INC */
+@@ -4287,6 +4291,7 @@
+ case 2: /* call Ev */
+ /* Ignore any sz value and operate as if sz==8. */
+ if (!(sz == 4 || sz == 8)) goto unhandledR;
++if (haveF2(pfx)) DIP(bnd ; ); /* MPX bnd prefix. */
+ sz = 8;
+ t3 = newTemp(Ity_I64);
+ assign(t3, getIRegE(sz,pfx,modrm));
+@@ -4302,6 +4307,7 @@
+ case 4: /* jmp Ev */
+ /* Ignore any sz value and operate as if sz==8. */
+ if (!(sz == 4 || sz == 8)) goto unhandledR;
++if (haveF2(pfx)) DIP(bnd ; ); /* MPX bnd prefix. */
+ sz = 8;
+ t3 = newTemp(Ity_I64);
+ assign(t3, getIRegE(sz,pfx,modrm));
+@@ -4334,11 +4340,14 @@
+showSz ? nameISize(sz) : ' ',
+nameIRegE(sz, pfx, modrm));
+} else {
+- /* Decide if F2/XACQ or F3/XREL might be valid. */
++ /* Decide if F2/XACQ, F3/XREL, F2/CALL or F2/JMP might be valid. */
+ Bool validF2orF3 = haveF2orF3(pfx) ? False : True;
+ if ((gregLO3ofRM(modrm) == 0/*INC*/ || gregLO3ofRM(modrm) == 1/*DEC*/)
+haveF2orF3(pfx) !haveF2andF3(pfx) haveLOCK(pfx)) {
+ validF2orF3 = True;
++ } else if ((gregLO3ofRM(modrm) == 2 || gregLO3ofRM(modrm) == 4)
++
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Monday, September 8, 2014 @ 20:13:18
Author: anatolik
Revision: 221165
upgpkg: valgrind 3.9.0-6
Rebuild against glibc-2.20
Added:
valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch
(from rev 221160, valgrind/trunk/valgrind-3.9.0-glibc-2.19.patch)
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/valgrind-3.9.0-glibc-2.19.patch
-+
PKGBUILD| 10 +-
valgrind-3.9.0-glibc-2.19.patch | 37 -
valgrind-3.9.0-glibc-2.20.patch | 37 +
3 files changed, 42 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-08 16:48:20 UTC (rev 221164)
+++ PKGBUILD2014-09-08 18:13:18 UTC (rev 221165)
@@ -4,25 +4,25 @@
pkgname=valgrind
pkgver=3.9.0
-pkgrel=5
+pkgrel=6
pkgdesc='A tool to help find memory-management problems in programs'
arch=(i686 x86_64)
license=(GPL)
url='http://valgrind.org/'
-depends=('glibc=2.19' 'glibc2.20' 'perl')
+depends=('glibc=2.20' 'glibc2.21' 'perl')
makedepends=('gdb' 'openmpi')
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.20.patch
add_xabort_op.patch)
sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
- '4653e994d2660490c51a97cc70e45a506e80bfab'
+ '2080c3d44de20857f18b03a93404a8f3d3721f7e'
'126e90494e0134a70649456cd1a1f1369024c345')
prepare() {
cd $pkgname-$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 # FS#41696
}
Deleted: valgrind-3.9.0-glibc-2.19.patch
===
--- valgrind-3.9.0-glibc-2.19.patch 2014-09-08 16:48:20 UTC (rev 221164)
+++ valgrind-3.9.0-glibc-2.19.patch 2014-09-08 18:13:18 UTC (rev 221165)
@@ -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.0 +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.0 +1000
-+++ valgrind-3.9.0/configure.ac2014-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])
Copied: valgrind/trunk/valgrind-3.9.0-glibc-2.20.patch (from rev 221160,
valgrind/trunk/valgrind-3.9.0-glibc-2.19.patch)
===
--- valgrind-3.9.0-glibc-2.20.patch (rev 0)
+++ valgrind-3.9.0-glibc-2.20.patch 2014-09-08 18:13:18 UTC (rev 221165)
@@ -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.0 +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
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Saturday, February 8, 2014 @ 12:27:07
Author: heftig
Revision: 205583
remove obsolete patches
Deleted:
valgrind/trunk/valgrind-3.8.1-glibc-2.18.patch
valgrind/trunk/valgrind-3.8.1-ptrace-build-fix.patch
valgrind/trunk/valgrind-3.8.1-xaddb.patch
---+
valgrind-3.8.1-glibc-2.18.patch | 33 -
valgrind-3.8.1-ptrace-build-fix.patch | 78
valgrind-3.8.1-xaddb.patch| 34 -
3 files changed, 145 deletions(-)
Deleted: valgrind-3.8.1-glibc-2.18.patch
===
--- valgrind-3.8.1-glibc-2.18.patch 2014-02-08 02:57:25 UTC (rev 205582)
+++ valgrind-3.8.1-glibc-2.18.patch 2014-02-08 11:27:07 UTC (rev 205583)
@@ -1,33 +0,0 @@
-diff -Naur valgrind-3.8.1-orig/configure.in valgrind-3.8.1/configure.in
valgrind-3.8.1-orig/configure.in 2013-08-13 22:36:20.201676976 +1000
-+++ valgrind-3.8.1/configure.in2013-08-13 22:38:18.402750093 +1000
-@@ -906,6 +906,20 @@
- DEFAULT_SUPP=glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}
- DEFAULT_SUPP=glibc-2.X-drd.supp ${DEFAULT_SUPP}
- ;;
-+ 2.17)
-+ AC_MSG_RESULT(2.17 family)
-+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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}
-+ ;;
-+ 2.18)
-+ AC_MSG_RESULT(2.18 family)
-+ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.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])
-@@ -919,7 +933,7 @@
-
- *)
- AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
-- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
-+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
- AC_MSG_ERROR([or Darwin libc])
- ;;
- esac
Deleted: valgrind-3.8.1-ptrace-build-fix.patch
===
--- valgrind-3.8.1-ptrace-build-fix.patch 2014-02-08 02:57:25 UTC (rev
205582)
+++ valgrind-3.8.1-ptrace-build-fix.patch 2014-02-08 11:27:07 UTC (rev
205583)
@@ -1,78 +0,0 @@
-Index: coregrind/vgdb.c
-===
coregrind/vgdb.c (revision 13470)
-+++ coregrind/vgdb.c (revision 13471)
-@@ -100,11 +100,10 @@
-
- #if defined(PTRACEINVOKER)
- #include sys/user.h
- #if defined(VGO_linux)
- # include sys/prctl.h
--# include linux/ptrace.h
- #endif
- #endif
-
-
- // Outputs information for the user about ptrace not working.
-
-Index: coregrind/vgdb.c
-===
coregrind/vgdb.c (revision 13481)
-+++ coregrind/vgdb.c (revision 13482)
-@@ -691,7 +691,7 @@
- // runtime check not yet done.
- // 0 : PTRACE_GETREGS runtime check has failed.
- // 1 : PTRACE_GETREGS defined and runtime check ok.
--#ifdef PTRACE_GETREGS
-+#ifdef HAVE_PTRACE_GETREGS
- static int has_working_ptrace_getregs = -1;
- #endif
-
-@@ -702,7 +702,7 @@
- Bool getregs (int pid, void *regs, long regs_bsz)
- {
-DEBUG(1, getregs regs_bsz %ld\n, regs_bsz);
--# ifdef PTRACE_GETREGS
-+# ifdef HAVE_PTRACE_GETREGS
-if (has_working_ptrace_getregs) {
- // Platforms having GETREGS
- long res;
-@@ -773,7 +773,7 @@
-DEBUG(1, setregs regs_bsz %ld\n, regs_bsz);
- // Note : the below is checking for GETREGS, not SETREGS
- // as if one is defined and working, the other one should also work.
--# ifdef PTRACE_GETREGS
-+# ifdef HAVE_PTRACE_GETREGS
-if (has_working_ptrace_getregs) {
- // Platforms having SETREGS
- long res;
-Index: configure.in
-===
configure.in (revision 13481)
-+++ configure.in (revision 13482)
-@@ -1040,6 +1040,25 @@
-
- AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes])
-
-+# Check for PTRACE_GETREGS
-+
-+AC_MSG_CHECKING([for PTRACE_GETREGS])
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#include stddef.h
-+#include sys/ptrace.h
-+#include sys/user.h
-+]], [[
-+ void *p;
-+ long res = ptrace (PTRACE_GETREGS, 0, p, p);
-+]])], [
-+AC_MSG_RESULT([yes])
-+AC_DEFINE([HAVE_PTRACE_GETREGS], 1,
-+ [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.])
-+], [
-+AC_MSG_RESULT([no])
-+])
-+
-+
- # Check for CLOCK_MONOTONIC
-
- AC_MSG_CHECKING([for CLOCK_MONOTONIC])
Deleted: valgrind-3.8.1-xaddb.patch
===
--- valgrind-3.8.1-xaddb.patch 2014-02-08 02:57:25 UTC
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Friday, August 10, 2012 @ 04:30:02
Author: allan
Revision: 165088
upgpkg: valgrind 3.8.0-1
upstream update, remove applied patches
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/valgrind-3.7.0-glibc-2.16.patch
valgrind/trunk/valgrind-3.7.0-supp.patch
-+
PKGBUILD| 16 --
valgrind-3.7.0-glibc-2.16.patch | 41 --
valgrind-3.7.0-supp.patch | 253 --
3 files changed, 5 insertions(+), 305 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-10 06:21:02 UTC (rev 165087)
+++ PKGBUILD2012-08-10 08:30:02 UTC (rev 165088)
@@ -3,8 +3,8 @@
# Maintainer: Allan McRae al...@archlinux.org
pkgname=valgrind
-pkgver=3.7.0
-pkgrel=4
+pkgver=3.8.0
+pkgrel=1
pkgdesc=A tool to help find memory-management problems in programs
arch=('i686' 'x86_64')
license=('GPL')
@@ -12,24 +12,18 @@
depends=('glibc=2.16' 'glibc2.17' 'perl')
makedepends=('gdb')
options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-valgrind-3.7.0-glibc-2.16.patch
-valgrind-3.7.0-supp.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
- '8362c9c10b8d7d08d1be628a717cfba7'
- '6cf8d3ace0cdc4c7fd69d61ca0692577')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ec04dfd1256307432b2a7b520398c526')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
- patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch
if [ ${CARCH} = x86_64 ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
else
./configure --prefix=/usr --mandir=/usr/share/man
fi
+
make
}
Deleted: valgrind-3.7.0-glibc-2.16.patch
===
--- valgrind-3.7.0-glibc-2.16.patch 2012-08-10 06:21:02 UTC (rev 165087)
+++ valgrind-3.7.0-glibc-2.16.patch 2012-08-10 08:30:02 UTC (rev 165088)
@@ -1,41 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.0 +1000
-+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,28 @@
- DEFAULT_SUPP=glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}
- DEFAULT_SUPP=glibc-2.X-drd.supp ${DEFAULT_SUPP}
- ;;
-+ 2.15)
-+ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.15 family 5
-+$as_echo 2.15 family 6; }
-+
-+$as_echo #define GLIBC_2_15 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}
-+ ;;
-+
-+ 2.16)
-+ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.16 family 5
-+$as_echo 2.16 family 6; }
-+
-+$as_echo #define GLIBC_2_16 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; }
-@@ -6422,7 +6433,7 @@
- *)
- { $as_echo $as_me:${as_lineno-$LINENO}: result: unsupported version
${GLIBC_VERSION} 5
- $as_echo unsupported version ${GLIBC_VERSION} 6; }
-- as_fn_error Valgrind requires glibc version 2.2 - 2.14 $LINENO 5
-+ as_fn_error Valgrind requires glibc version 2.2 - 2.16 $LINENO 5
- as_fn_error or Darwin libc $LINENO 5
- ;;
- esac
Deleted: valgrind-3.7.0-supp.patch
===
--- valgrind-3.7.0-supp.patch 2012-08-10 06:21:02 UTC (rev 165087)
+++ valgrind-3.7.0-supp.patch 2012-08-10 08:30:02 UTC (rev 165088)
@@ -1,253 +0,0 @@
valgrind-orig/exp-sgcheck.supp 2011-10-27 07:24:45.0 +1000
-+++ valgrind-new/exp-sgcheck.supp 2012-07-12 21:49:58.290123661 +1000
-@@ -1,8 +1,8 @@
- {
-ld-2.X possibly applying relocations
-exp-sgcheck:SorG
-- obj:/*lib*/ld-2.*so*
-- obj:/*lib*/ld-2.*so*
-+ obj:*/*lib*/ld-2.*so*
-+ obj:*/*lib*/ld-2.*so*
- }
-
- # I'm pretty sure this is a false positive caused by the sg_ stuff
valgrind-orig/glibc-2.34567-NPTL-helgrind.supp 2011-10-27
07:24:45.0 +1000
-+++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp 2012-07-12
21:50:03.663270525 +1000
-@@ -27,7 +27,7 @@
- #{
- # helgrind-glibc2X-001
- # Helgrind:Race
--# obj:/lib*/ld-2.*so*
-+# obj:*/lib*/ld-2.*so*
- #}
-
- # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
-@@ -37,13 +37,13 @@
- {
-helgrind-glibc2X-004
-Helgrind:Race
-- obj:/lib*/libc-2.*so*
-+ obj:*/lib*/libc-2.*so*
- }
-
- {
-helgrind-glibc2X-005
-Helgrind:Race
-- obj:/lib*/libpthread-2.*so*
-+ obj:*/lib*/libpthread-2.*so*
-
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Tuesday, July 3, 2012 @ 03:47:19
Author: allan
Revision: 162894
upgpkg: valgrind 3.7.0-3
glibc-2.16 rebuild
Added:
valgrind/trunk/valgrind-3.7.0-glibc-2.16.patch
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/valgrind-3.7.0-glibc-2.15.patch
-+
PKGBUILD| 10 -
valgrind-3.7.0-glibc-2.15.patch | 30 ---
valgrind-3.7.0-glibc-2.16.patch | 41 ++
3 files changed, 46 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-02 23:01:37 UTC (rev 162893)
+++ PKGBUILD2012-07-03 07:47:19 UTC (rev 162894)
@@ -4,23 +4,23 @@
pkgname=valgrind
pkgver=3.7.0
-pkgrel=2
+pkgrel=3
pkgdesc=A tool to help find memory-management problems in programs
arch=('i686' 'x86_64')
license=('GPL')
url=http://valgrind.org/;
-depends=('glibc=2.15' 'glibc2.16' 'perl')
+depends=('glibc=2.16' 'glibc2.17' 'perl')
makedepends=('gdb')
options=('!emptydirs')
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-valgrind-3.7.0-glibc-2.15.patch)
+valgrind-3.7.0-glibc-2.16.patch)
md5sums=('a855fda56edf05614f099dca316d1775'
- 'f534b79b358cdced0319b375aafde4d5')
+ '8362c9c10b8d7d08d1be628a717cfba7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+ patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
if [ ${CARCH} = x86_64 ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
Deleted: valgrind-3.7.0-glibc-2.15.patch
===
--- valgrind-3.7.0-glibc-2.15.patch 2012-07-02 23:01:37 UTC (rev 162893)
+++ valgrind-3.7.0-glibc-2.15.patch 2012-07-03 07:47:19 UTC (rev 162894)
@@ -1,30 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.0 +1000
-+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,17 @@
- DEFAULT_SUPP=glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}
- DEFAULT_SUPP=glibc-2.X-drd.supp ${DEFAULT_SUPP}
- ;;
-+ 2.15)
-+ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.15 family 5
-+$as_echo 2.15 family 6; }
-+
-+$as_echo #define GLIBC_2_15 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; }
-@@ -6422,7 +6433,7 @@
- *)
- { $as_echo $as_me:${as_lineno-$LINENO}: result: unsupported version
${GLIBC_VERSION} 5
- $as_echo unsupported version ${GLIBC_VERSION} 6; }
-- as_fn_error Valgrind requires glibc version 2.2 - 2.14 $LINENO 5
-+ as_fn_error Valgrind requires glibc version 2.2 - 2.15 $LINENO 5
- as_fn_error or Darwin libc $LINENO 5
- ;;
- esac
Added: valgrind-3.7.0-glibc-2.16.patch
===
--- valgrind-3.7.0-glibc-2.16.patch (rev 0)
+++ valgrind-3.7.0-glibc-2.16.patch 2012-07-03 07:47:19 UTC (rev 162894)
@@ -0,0 +1,41 @@
+diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
+--- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.0 +1000
valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
+@@ -6402,6 +6402,28 @@
+ DEFAULT_SUPP=glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}
+ DEFAULT_SUPP=glibc-2.X-drd.supp ${DEFAULT_SUPP}
+ ;;
++ 2.15)
++ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.15 family 5
++$as_echo 2.15 family 6; }
++
++$as_echo #define GLIBC_2_15 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}
++ ;;
++
++ 2.16)
++ { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.16 family 5
++$as_echo 2.16 family 6; }
++
++$as_echo #define GLIBC_2_16 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; }
+@@ -6422,7 +6433,7 @@
+ *)
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: unsupported version
${GLIBC_VERSION} 5
+ $as_echo unsupported version ${GLIBC_VERSION} 6; }
+- as_fn_error Valgrind requires glibc version 2.2 - 2.14 $LINENO 5
++ as_fn_error Valgrind requires glibc version 2.2 - 2.16 $LINENO 5
+ as_fn_error or Darwin libc $LINENO 5
+ ;;
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Thursday, February 17, 2011 @ 07:26:47
Author: allan
Revision: 110184
upgpkg: valgrind 3.6.1-1
upstream update, remove patches applied upstream
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/glibc-2.13-strcasecmp.patch
valgrind/trunk/glibc-2.13.patch
-+
PKGBUILD| 20 +
glibc-2.13-strcasecmp.patch | 151 --
glibc-2.13.patch| 33 -
3 files changed, 5 insertions(+), 199 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 12:11:03 UTC (rev 110183)
+++ PKGBUILD2011-02-17 12:26:47 UTC (rev 110184)
@@ -3,8 +3,8 @@
# Maintainer: Allan McRae al...@archlinux.org
pkgname=valgrind
-pkgver=3.6.0
-pkgrel=3
+pkgver=3.6.1
+pkgrel=1
pkgdesc=A tool to help find memory-management problems in programs
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,13 +13,9 @@
makedepends=('gdb')
options=('!emptydirs')
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-glibc-patch-version.patch
- glibc-2.13.patch
- glibc-2.13-strcasecmp.patch)
-md5sums=('b289c5f4ab8e39741602445f1dd09b34'
- 'b657f0ebdde3d9aefc9fd16f9e653702'
- '3706469d3b712f420e161a5ba1143d02'
- 'd593be202296116653c792556ab6db73')
+glibc-patch-version.patch)
+md5sums=('2c3aa122498baecc9d69194057ca88f5'
+ 'b657f0ebdde3d9aefc9fd16f9e653702')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,12 +26,6 @@
# prevent need to rebuild with glibc patch level version bumps
patch -Np1 -i ${srcdir}/glibc-patch-version.patch
- # glibc-2.13 compatibility
- patch -Np1 -i ${srcdir}/glibc-2.13.patch
-
- # http://bugs.kde.org/show_bug.cgi?id=256600
- patch -Np0 -i ${srcdir}/glibc-2.13-strcasecmp.patch
-
if [ ${CARCH} = x86_64 ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
else
Deleted: glibc-2.13-strcasecmp.patch
===
--- glibc-2.13-strcasecmp.patch 2011-02-17 12:11:03 UTC (rev 110183)
+++ glibc-2.13-strcasecmp.patch 2011-02-17 12:26:47 UTC (rev 110184)
@@ -1,151 +0,0 @@
-Index: memcheck/mc_replace_strmem.c
-===
memcheck/mc_replace_strmem.c (revision 11477)
-+++ memcheck/mc_replace_strmem.c (revision 11478)
-@@ -35,10 +35,13 @@
- #include pub_tool_redir.h
- #include pub_tool_tooliface.h
- #include valgrind.h
-+#include config.h
-
- #include mc_include.h
- #include memcheck.h
-
-+#include ctype.h
-+
- /* -
-We have our own versions of these functions for two reasons:
-(a) it allows us to do overlap checking
-@@ -403,6 +406,120 @@
- #endif
-
-
-+#define STRCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ) \
-+ { \
-+ register unsigned char c1; \
-+ register unsigned char c2; \
-+ while (True) { \
-+ c1 = tolower(*(unsigned char *)s1); \
-+ c2 = tolower(*(unsigned char *)s2); \
-+ if (c1 != c2) break; \
-+ if (c1 == 0) break; \
-+ s1++; s2++; \
-+ } \
-+ if ((unsigned char)c1 (unsigned char)c2) return -1; \
-+ if ((unsigned char)c1 (unsigned char)c2) return 1; \
-+ return 0; \
-+ }
-+
-+STRCASECMP(VG_Z_LIBC_SONAME, strcasecmp)
-+#if defined(VGO_linux)
-+STRCASECMP(VG_Z_LIBC_SONAME, __GI_strcasecmp)
-+#endif
-+
-+
-+#define STRNCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ) \
-+ { \
-+ SizeT n = 0; \
-+ while (True) { \
-+ if (n = nmax) return 0; \
-+ if (*s1 == 0 *s2 == 0) return 0; \
-+ if (*s1 == 0) return -1; \
-+ if (*s2 == 0) return 1; \
-+ \
-+ if (tolower(*(unsigned char*)s1) tolower(*(unsigned char*)s2))
return -1; \
-+ if (tolower(*(unsigned char*)s1) tolower(*(unsigned char*)s2))
return 1; \
-+ \
-+ s1++; s2++; n++; \
-+ } \
-+ }
-+
-+STRNCASECMP(VG_Z_LIBC_SONAME, strncasecmp)
-+#if defined(VGO_linux)
-+STRNCASECMP(VG_Z_LIBC_SONAME, __GI_strncasecmp)
-+#elif defined(VGO_darwin)
-+STRNCASECMP(VG_Z_DYLD,strncasecmp)
-+#endif
-+
-+
-+#ifdef HAVE_TOLOWER_L
-+
-+
-+#define STRCASECMP_L(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ) \
-+ {
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Saturday, May 29, 2010 @ 06:23:19
Author: allan
Revision: 81358
upgpkg: valgrind 3.5.0-5
fix excess output with glibc-2.12 (FS#19634), move the sed to use our CFLAGS to
a place that actually works...
Added:
valgrind/trunk/valgrind-3.5.0-elf-indirect-functions.patch
Modified:
valgrind/trunk/PKGBUILD
valgrind/trunk/glibc-2.12.patch
-+
PKGBUILD| 20
glibc-2.12.patch| 87
valgrind-3.5.0-elf-indirect-functions.patch | 528 ++
3 files changed, 556 insertions(+), 79 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-05-29 09:05:55 UTC (rev 81357)
+++ PKGBUILD2010-05-29 10:23:19 UTC (rev 81358)
@@ -4,7 +4,7 @@
pkgname=valgrind
pkgver=3.5.0
-pkgrel=4
+pkgrel=5
pkgdesc=A tool to help find memory-management problems in programs
arch=('i686' 'x86_64')
license=('GPL')
@@ -15,22 +15,26 @@
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
glibc-patch-version.patch
glibc-2.12.patch
-valgrind-3.5.0-stat_h.patch)
+valgrind-3.5.0-stat_h.patch
+valgrind-3.5.0-elf-indirect-functions.patch)
md5sums=('f03522a4687cf76c676c9494fcc0a517'
'b657f0ebdde3d9aefc9fd16f9e653702'
- 'feb92ea98059b4e57239220e4b695f9d'
- 'e435a0debedf207b279256eff50c68f6')
+ '0ac843aecfc539a53ae88c48b1a17047'
+ 'e435a0debedf207b279256eff50c68f6'
+ '10af3a098fa1f62441b7e52dbce38969')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+
+ # make sure our CFLAGS are respected
+ sed -i -e 's:^CFLAGS=-Wno-long-long:CFLAGS=$CFLAGS -Wno-long-long:'
configure.in
+
patch -Np1 -i ${srcdir}/glibc-patch-version.patch || return 1
- patch -Np1 -i ${srcdir}/glibc-2.12.patch || return 1
+ patch -Np0 -i ${srcdir}/glibc-2.12.patch || return 1
patch -Np1 -i ${srcdir}/valgrind-3.5.0-stat_h.patch || return 1
+ patch -Np0 -i ${srcdir}/valgrind-3.5.0-elf-indirect-functions.patch ||
return 1
autoreconf
- # make sure our CFLAGS are respected
- sed -i -e 's:^CFLAGS=-Wno-long-long:CFLAGS=$CFLAGS -Wno-long-long:'
configure.in
-
if [ ${CARCH} = x86_64 ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit ||
return 1
else
Modified: glibc-2.12.patch
===
--- glibc-2.12.patch2010-05-29 09:05:55 UTC (rev 81357)
+++ glibc-2.12.patch2010-05-29 10:23:19 UTC (rev 81358)
@@ -1,72 +1,8 @@
-diff -Naur valgrind-3.5.0-old//config.h.in valgrind-3.5.0/config.h.in
valgrind-3.5.0-old//config.h.in2009-08-19 23:39:05.0 +1000
-+++ valgrind-3.5.0/config.h.in 2010-05-22 19:55:31.065364428 +1000
-@@ -15,6 +15,9 @@
- /* Define to 1 if you're using glibc 2.10.x */
- #undef GLIBC_2_10
-
-+/* Define to 1 if you're using glibc 2.12.x */
-+#undef GLIBC_2_12
-+
- /* Define to 1 if you're using glibc 2.2.x */
- #undef GLIBC_2_2
-
-diff -Naur valgrind-3.5.0-old//configure valgrind-3.5.0/configure
valgrind-3.5.0-old//configure 2009-08-19 23:44:07.0 +1000
-+++ valgrind-3.5.0/configure 2010-05-22 20:01:04.822065382 +1000
-@@ -5025,6 +5025,29 @@
- cat conftest.$ac_ext _ACEOF
- /* end confdefs.h. */
-
-+#include features.h
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 __GLIBC_MINOR__ == 12)
-+ GLIBC_212
-+ #endif
-+#endif
-+
-+_ACEOF
-+if (eval $ac_cpp conftest.$ac_ext) 25 |
-+ $EGREP GLIBC_212 /dev/null 21; then
-+ GLIBC_VERSION=2.12
-+fi
-+rm -f conftest*
-+
-+
-+cat conftest.$ac_ext _ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h conftest.$ac_ext
-+cat conftest.$ac_ext _ACEOF
-+/* end confdefs.h. */
-+
-+
- #include standards.h
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) ||
defined(_AIXVERSION_530)
- AIX5_LIBC
-@@ -5171,6 +5194,18 @@
- _ACEOF
-
- 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}
-+ ;;
-+ 2.12)
-+ echo $as_me:$LINENO: result: 2.12 family 5
-+echo ${ECHO_T}2.12 family 6
-+
-+cat confdefs.h \_ACEOF
-+#define GLIBC_2_12 1
-+_ACEOF
-+
-+ 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}
- ;;
-diff -Naur valgrind-3.5.0-old//configure.in valgrind-3.5.0/configure.in
valgrind-3.5.0-old//configure.in 2009-08-19 23:37:48.0 +1000
-+++ valgrind-3.5.0/configure.in2010-05-22 19:54:43.788423252 +1000
-@@ -656,6 +656,16 @@
+Index: configure.in
+===
+--- configure.in (revision 11128)
configure.in (revision 11129)
+@@ -684,6 +684,16 @@
],
GLIBC_VERSION=2.10)
@@ -83,11 +19,11 @@
