extra/valgrind to 3.8.0-1

This commit is contained in:
Kevin Mihelich 2012-08-11 17:14:15 +00:00
parent db48393b86
commit 90ba4f0a93
3 changed files with 3 additions and 303 deletions

View file

@ -6,8 +6,8 @@
# - patch to fix building on armv5
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')
@ -16,19 +16,13 @@ depends=('glibc>=2.16' 'glibc<2.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
alarm.patch)
md5sums=('a855fda56edf05614f099dca316d1775'
'8362c9c10b8d7d08d1be628a717cfba7'
'6cf8d3ace0cdc4c7fd69d61ca0692577'
md5sums=('ec04dfd1256307432b2a7b520398c526'
'09895dece4b831ceb80285c2175ae937')
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
[ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
if [ "${CARCH}" = "x86_64" ]; then

View file

@ -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.000000000 +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

View file

@ -1,253 +0,0 @@
--- valgrind-orig/exp-sgcheck.supp 2011-10-27 07:24:45.000000000 +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.000000000 +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*
}
# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
@@ -78,14 +78,14 @@
{
helgrind-glibc2X-101
Helgrind:Race
- obj:/lib*/libpthread-2.*so*
+ obj:*/lib*/libpthread-2.*so*
fun:pthread_*
}
{
helgrind-glibc2X-102
Helgrind:Race
fun:mythread_wrapper
- obj:/lib*/libpthread-2.*so*
+ obj:*/lib*/libpthread-2.*so*
}
{
helgrind-glibc2X-103
@@ -110,7 +110,7 @@
{
helgrind-glibc2X-107
Helgrind:Race
- obj:/lib*/libpthread-2.*so*
+ obj:*/lib*/libpthread-2.*so*
fun:sem_*
}
{
@@ -126,7 +126,7 @@
{
helgrind-glibc2X-110
Helgrind:Race
- obj:/lib*/libc-2.*so*
+ obj:*/lib*/libc-2.*so*
fun:pthread_*
}
{
--- valgrind-orig/glibc-2.X.supp.in 2011-10-27 07:24:45.000000000 +1000
+++ valgrind-new/glibc-2.X.supp.in 2012-07-12 21:49:57.323490407 +1000
@@ -39,74 +39,74 @@
{
dl-hack3-cond-1
Memcheck:Cond
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
}
{
dl-hack3-cond-2
Memcheck:Cond
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/libc-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libc-@GLIBC_VERSION@*.so*
}
{
dl-hack3-cond-3
Memcheck:Cond
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/libc-@GLIBC_VERSION@*.so*
- obj:/lib*/libc-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libc-@GLIBC_VERSION@*.so*
}
{
dl-hack3-cond-4
Memcheck:Cond
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
}
{
dl-hack4-64bit-addr-1
Memcheck:Addr8
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
}
{
dl-hack4-64bit-addr-2
Memcheck:Addr8
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/libc-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libc-@GLIBC_VERSION@*.so*
}
{
dl-hack4-64bit-addr-3
Memcheck:Addr8
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so*
- obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
}
{
dl-hack5-32bit-addr-1
Memcheck:Addr4
- obj:/lib*/ld-@GLIBC_VERSION@*.so
- obj:/lib*/ld-@GLIBC_VERSION@*.so
- obj:/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
}
{
dl-hack5-32bit-addr-3
Memcheck:Addr4
- obj:/lib*/ld-@GLIBC_VERSION@*.so
- obj:/lib*/ld-@GLIBC_VERSION@*.so
- obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
}
{
dl-hack5-32bit-addr-4
Memcheck:Addr4
- obj:/lib*/ld-@GLIBC_VERSION@*.so
- obj:/lib*/libdl-@GLIBC_VERSION@*.so*
- obj:/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ obj:*/lib*/ld-@GLIBC_VERSION@*.so
}
@@ -149,9 +149,9 @@
{
glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
Memcheck:Addr4
- obj:/lib/ld-@GLIBC_VERSION@*.so
- obj:/lib/ld-@GLIBC_VERSION@*.so
- obj:/lib/ld-@GLIBC_VERSION@*.so
+ obj:*/lib/ld-@GLIBC_VERSION@*.so
+ obj:*/lib/ld-@GLIBC_VERSION@*.so
+ obj:*/lib/ld-@GLIBC_VERSION@*.so
}
{
@@ -225,7 +225,7 @@
MVL-401-linuxthreads-pthread_create
Memcheck:Param
write(buf)
- obj:/lib/libpthread-0.10.so
+ obj:*/lib/libpthread-0.10.so
fun:pthread_create
}
--- valgrind-orig/glibc-2.X-drd.supp 2011-10-27 07:24:45.000000000 +1000
+++ valgrind-new/glibc-2.X-drd.supp 2012-07-12 21:49:57.323490407 +1000
@@ -6,7 +6,7 @@
{
drd-ld
drd:ConflictingAccess
- obj:/lib*/ld-*.so
+ obj:*/lib*/ld-*.so
}
#
@@ -22,13 +22,19 @@
{
drd-libc-stdio
drd:ConflictingAccess
- obj:/lib*/libc-*
+ obj:*/lib*/libc-*
}
{
drd-libc-thread-cancellation-test
drd:ConflictingAccess
fun:write
}
+{
+ drd-libc-random
+ drd:ConflictingAccess
+ fun:random_r
+ fun:random
+}
#
# Suppression patterns for libstdc++, the implementation of the standard C++
@@ -128,7 +134,7 @@
{
drd-libpthread-?
drd:ConflictingAccess
- obj:/lib/libgcc_s.so.1
+ obj:*/lib/libgcc_s.so.1
}
{
drd-libpthread-nanosleep
@@ -171,6 +177,7 @@
{
drd-libxcb-xcb_wait_for_reply
drd:CondErr
+ ...
fun:pthread_cond_destroy*
fun:xcb_wait_for_reply
}