[arch-commits] Commit in valgrind/trunk (4 files)

2015-08-06 Thread Anatol Pomozov
Date: Thursday, August 6, 2015 @ 18:15:41
  Author: anatolik
Revision: 243088

upgpkg: valgrind 3.10.1-3

glibc 2.22 rebuild

Added:
  valgrind/trunk/valgrind-glibc.patch
(from rev 243087, valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch)
  valgrind/trunk/valgrind-kernel-version.patch
Modified:
  valgrind/trunk/PKGBUILD
Deleted:
  valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch

-+
 PKGBUILD|   13 ---
 valgrind-3.9.0-glibc-2.21.patch |   54 -
 valgrind-glibc.patch|   69 ++
 valgrind-kernel-version.patch   |   47 +
 4 files changed, 124 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-06 15:48:22 UTC (rev 243087)
+++ PKGBUILD2015-08-06 16:15:41 UTC (rev 243088)
@@ -4,23 +4,26 @@
 
 pkgname=valgrind
 pkgver=3.10.1
-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.21' 'glibc2.22' 'perl')
+depends=('glibc=2.22' 'glibc2.23' 'perl')
 makedepends=('gdb' 'openmpi')
 optdepends=('openmpi: MPI support')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-valgrind-3.9.0-glibc-2.21.patch)
+valgrind-glibc.patch
+   valgrind-kernel-version.patch)
 sha1sums=('15518427de842547ffa84eff8b2b67f3b16581a8'
-  'f1740a5b03c69baee4aa0cefb27315d6b5ec6699')
+  '1fa127ef24630ad5f4901ea0e37ea2acb12d3d17'
+  '08b71e1ebc3e3906d0ff273db0aba2177a857c47')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.21.patch
+  patch -p1 -i $srcdir/valgrind-glibc.patch
+  patch -p1 -i $srcdir/valgrind-kernel-version.patch
 }
 
 build() {

Deleted: valgrind-3.9.0-glibc-2.21.patch
===
--- valgrind-3.9.0-glibc-2.21.patch 2015-08-06 15:48:22 UTC (rev 243087)
+++ valgrind-3.9.0-glibc-2.21.patch 2015-08-06 16:15:41 UTC (rev 243088)
@@ -1,54 +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,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 ${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,20 @@
-   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}
-+  ;;
-+ 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}
-+  ;;
-  darwin)
-   AC_MSG_RESULT(Darwin)
-   AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])

Copied: valgrind/trunk/valgrind-glibc.patch (from rev 243087, 
valgrind/trunk/valgrind-3.9.0-glibc-2.21.patch)
===
--- valgrind-glibc.patch(rev 0)
+++ valgrind-glibc.patch2015-08-06 16:15:41 UTC (rev 243088)
@@ -0,0 +1,69 @@
+From 8e520f21445e7c376c2606826affb20be92bfe8d Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov anatol.pomo...@gmail.com
+Date: Thu, 6 Aug 2015 09:04:44 -0700

[arch-commits] Commit in valgrind/trunk (4 files)

2013-08-13 Thread Allan McRae
Date: Tuesday, August 13, 2013 @ 15:54:39
  Author: allan
Revision: 192524

upgpkg: valgrind 3.8.1-3

glibc-2.18 rebuild

Added:
  valgrind/trunk/valgrind-3.8.1-glibc-2.18.patch
(from rev 192514, valgrind/trunk/valgrind-3.8.1-glibc-2.17.patch)
  valgrind/trunk/valgrind-3.8.1-ptrace-build-fix.patch
Modified:
  valgrind/trunk/PKGBUILD
Deleted:
  valgrind/trunk/valgrind-3.8.1-glibc-2.17.patch

---+
 PKGBUILD  |   25 +++---
 valgrind-3.8.1-glibc-2.17.patch   |   37 ---
 valgrind-3.8.1-glibc-2.18.patch   |   33 +
 valgrind-3.8.1-ptrace-build-fix.patch |   78 
 4 files changed, 129 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-13 12:52:11 UTC (rev 192523)
+++ PKGBUILD2013-08-13 13:54:39 UTC (rev 192524)
@@ -4,25 +4,36 @@
 
 pkgname=valgrind
 pkgver=3.8.1
-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.17' 'glibc2.18' 'perl')
+depends=('glibc=2.18' 'glibc2.19' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-valgrind-3.8.1-glibc-2.17.patch)
+valgrind-3.8.1-glibc-2.18.patch
+valgrind-3.8.1-ptrace-build-fix.patch)
 md5sums=('288758010b271119a0ffc0183f1d6e38'
- 'e87c34f9f9ce0040d141b3bd57842b5c')
+ 'f3f911e6f5b0ab9d176d40b47d6cae24'
+ '9d429e62255621a0c190a8180d8ab1a4')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.18.patch
+  
+  # based on svn commits 13471  13482
+  patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch
+  
+  ./autogen.sh
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch
-
-  if [ ${CARCH} = x86_64 ]; then
+  if [[ ${CARCH} = x86_64 ]]; then
 ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
 ./configure --prefix=/usr --mandir=/usr/share/man

Deleted: valgrind-3.8.1-glibc-2.17.patch
===
--- valgrind-3.8.1-glibc-2.17.patch 2013-08-13 12:52:11 UTC (rev 192523)
+++ valgrind-3.8.1-glibc-2.17.patch 2013-08-13 13:54:39 UTC (rev 192524)
@@ -1,37 +0,0 @@
-diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure
 valgrind-3.8.1-orig/configure  2012-09-19 05:19:23.0 +1000
-+++ valgrind-3.8.1/configure   2012-12-27 08:11:36.645429011 +1000
-@@ -6612,6 +6612,24 @@
- 
-   # DEFAULT_SUPP set by kernel version check above.
-   ;;
-+ 2.17)
-+  { $as_echo $as_me:${as_lineno-$LINENO}: result: 2.17 family 5
-+$as_echo 2.17 family 6; }
-+
-+$as_echo #define GLIBC_2_17 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; }
-+
-+$as_echo #define DARWIN_LIBC 1 confdefs.h
-+
-+  # DEFAULT_SUPP set by kernel version check above.
-+  ;;
-  bionic)
-   { $as_echo $as_me:${as_lineno-$LINENO}: result: Bionic 5
- $as_echo Bionic 6; }
-@@ -6624,7 +6642,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.16 $LINENO 5
-+  as_fn_error Valgrind requires glibc version 2.2 - 2.17 $LINENO 5
-   as_fn_error or Darwin libc $LINENO 5
-   ;;
- esac

Copied: valgrind/trunk/valgrind-3.8.1-glibc-2.18.patch (from rev 192514, 
valgrind/trunk/valgrind-3.8.1-glibc-2.17.patch)
===
--- valgrind-3.8.1-glibc-2.18.patch (rev 0)
+++ valgrind-3.8.1-glibc-2.18.patch 2013-08-13 13:54:39 UTC (rev 192524)
@@ -0,0 +1,33 @@
+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)
++  

[arch-commits] Commit in valgrind/trunk (4 files)

2010-10-21 Thread Allan McRae
Date: Thursday, October 21, 2010 @ 23:15:18
  Author: allan
Revision: 96540

upgpkg: valgrind 3.6.0-1
remove unneeded patches

Deleted:
  valgrind/trunk/glibc-2.12.patch
  valgrind/trunk/valgrind-3.5.0-elf-indirect-functions.patch
  valgrind/trunk/valgrind-3.5.0-initialise-isifunc.patch
  valgrind/trunk/valgrind-3.5.0-stat_h.patch

-+
 glibc-2.12.patch|   44 --
 valgrind-3.5.0-elf-indirect-functions.patch |  528 --
 valgrind-3.5.0-initialise-isifunc.patch |   12 
 valgrind-3.5.0-stat_h.patch |   48 --
 4 files changed, 632 deletions(-)

Deleted: glibc-2.12.patch
===
--- glibc-2.12.patch2010-10-22 03:12:46 UTC (rev 96539)
+++ glibc-2.12.patch2010-10-22 03:15:18 UTC (rev 96540)
@@ -1,44 +0,0 @@
-Index: configure.in
-===
 configure.in   (revision 11128)
-+++ configure.in   (revision 11129)
-@@ -684,6 +684,16 @@
- ],
- GLIBC_VERSION=2.10)
- 
-+AC_EGREP_CPP([GLIBC_212], [
-+#include features.h
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2  __GLIBC_MINOR__ == 12)
-+  GLIBC_212
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION=2.12)
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include standards.h
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || 
defined(_AIXVERSION_530)
-@@ -776,6 +786,13 @@
-   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)
-+  AC_MSG_RESULT(2.12 family)
-+  AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.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}
-   ;;
-  aix5)
-   AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
-@@ -790,7 +807,7 @@
- 
-  *)
-   AC_MSG_RESULT(unsupported version)
--  AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+  AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12])
-   AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
-   AC_MSG_ERROR([or Darwin libc])
-   ;;

Deleted: valgrind-3.5.0-elf-indirect-functions.patch
===
--- valgrind-3.5.0-elf-indirect-functions.patch 2010-10-22 03:12:46 UTC (rev 
96539)
+++ valgrind-3.5.0-elf-indirect-functions.patch 2010-10-22 03:15:18 UTC (rev 
96540)
@@ -1,528 +0,0 @@
-Index: memcheck/mc_replace_strmem.c
-===
 memcheck/mc_replace_strmem.c   (revision 10919)
-+++ memcheck/mc_replace_strmem.c   (revision 10920)
-@@ -116,6 +116,7 @@
- STRRCHR(VG_Z_LIBC_SONAME,   strrchr)
- STRRCHR(VG_Z_LIBC_SONAME,   rindex)
- #if defined(VGO_linux)
-+STRRCHR(VG_Z_LIBC_SONAME,   __GI_strrchr)
- STRRCHR(VG_Z_LD_LINUX_SO_2, rindex)
- #elif defined(VGO_darwin)
- STRRCHR(VG_Z_DYLD,  strrchr)
-@@ -140,6 +141,7 @@
- STRCHR(VG_Z_LIBC_SONAME,  strchr)
- STRCHR(VG_Z_LIBC_SONAME,  index)
- #if defined(VGO_linux)
-+STRCHR(VG_Z_LIBC_SONAME,  __GI_strchr)
- STRCHR(VG_Z_LD_LINUX_SO_2,strchr)
- STRCHR(VG_Z_LD_LINUX_SO_2,index)
- STRCHR(VG_Z_LD_LINUX_X86_64_SO_2, strchr)
-@@ -172,8 +174,10 @@
-}
- 
- STRCAT(VG_Z_LIBC_SONAME, strcat)
-+#if defined(VGO_linux)
-+STRCAT(VG_Z_LIBC_SONAME, __GI_strcat)
-+#endif
- 
--
- #define STRNCAT(soname, fnname) \
-char* VG_REPLACE_FUNCTION_ZU(soname,fnname) \
- ( char* dst, const char* src, SizeT n ); \
-@@ -257,6 +261,9 @@
-}
- 
- STRNLEN(VG_Z_LIBC_SONAME, strnlen)
-+#if defined(VGO_linux)
-+STRNLEN(VG_Z_LIBC_SONAME, __GI_strnlen)
-+#endif
-
- 
- // Note that this replacement often doesn't get used because gcc inlines
-@@ -274,6 +281,7 @@
- 
- STRLEN(VG_Z_LIBC_SONAME,  strlen)
- #if defined(VGO_linux)
-+STRLEN(VG_Z_LIBC_SONAME,  __GI_strlen)
- STRLEN(VG_Z_LD_LINUX_SO_2,strlen)
- STRLEN(VG_Z_LD_LINUX_X86_64_SO_2, strlen)
- #endif
-@@ -301,7 +309,9 @@
-}
- 
- STRCPY(VG_Z_LIBC_SONAME, strcpy)
--#if defined(VGO_darwin)
-+#if defined(VGO_linux)
-+STRCPY(VG_Z_LIBC_SONAME, __GI_strcpy)
-+#elif defined(VGO_darwin)
- STRCPY(VG_Z_DYLD,strcpy)
- #endif
- 
-@@ -327,7 +337,9 @@
-}
- 
- STRNCPY(VG_Z_LIBC_SONAME, strncpy)
--#if defined(VGO_darwin)
-+#if defined(VGO_linux)
-+STRNCPY(VG_Z_LIBC_SONAME, __GI_strncpy)
-+#elif defined(VGO_darwin)
- STRNCPY(VG_Z_DYLD,strncpy)
- #endif
- 
-@@ -384,7 +396,9 @@
-}
- 
- STRNCMP(VG_Z_LIBC_SONAME, strncmp)
--#if defined(VGO_darwin)
-+#if defined(VGO_linux)
-+STRNCMP(VG_Z_LIBC_SONAME, __GI_strncmp)
-+#elif defined(VGO_darwin)
- STRNCMP(VG_Z_DYLD,strncmp)
- #endif
- 
-@@ -411,6 +425,7 @@
- 
- STRCMP(VG_Z_LIBC_SONAME,  

[arch-commits] Commit in valgrind/trunk (4 files)

2010-05-22 Thread Allan McRae
Date: Saturday, May 22, 2010 @ 06:20:12
  Author: allan
Revision: 80795

upgpkg: valgrind 3.5.0-4
glibc-2.12 rebuild, patch for glibc-2.12.x compatibility, build fix for current 
toolchain

Added:
  valgrind/trunk/glibc-2.12.patch
  valgrind/trunk/glibc-patch-version.patch
  valgrind/trunk/valgrind-3.5.0-stat_h.patch
Modified:
  valgrind/trunk/PKGBUILD

-+
 PKGBUILD|   23 +++--
 glibc-2.12.patch|   99 ++
 glibc-patch-version.patch   |   52 ++
 valgrind-3.5.0-stat_h.patch |   48 
 4 files changed, 216 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-22 10:12:23 UTC (rev 80794)
+++ PKGBUILD2010-05-22 10:20:12 UTC (rev 80795)
@@ -4,21 +4,28 @@
 
 pkgname=valgrind
 pkgver=3.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc=A tool to help find memory-management problems in programs
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://valgrind.org/;
-depends=('glibc=2.11' 'glibc2.12' 'perl')
+depends=('glibc=2.12' 'glibc2.13' 'perl')
 makedepends=('gdb')
-options=(!emptydirs)
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 
glibc211.diff)
+options=('!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+glibc-patch-version.patch
+glibc-2.12.patch
+valgrind-3.5.0-stat_h.patch)
 md5sums=('f03522a4687cf76c676c9494fcc0a517'
- 'bb137ce7378b6a2d1ad203418da8b68f')
+ 'b657f0ebdde3d9aefc9fd16f9e653702'
+ 'feb92ea98059b4e57239220e4b695f9d'
+ 'e435a0debedf207b279256eff50c68f6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/glibc211.diff || return 1
+  patch -Np1 -i ${srcdir}/glibc-patch-version.patch || return 1
+  patch -Np1 -i ${srcdir}/glibc-2.12.patch || return 1
+  patch -Np1 -i ${srcdir}/valgrind-3.5.0-stat_h.patch || return 1
   autoreconf
 
   # make sure our CFLAGS are respected
@@ -30,5 +37,9 @@
 ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   fi
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
 }

Added: glibc-2.12.patch
===
--- glibc-2.12.patch(rev 0)
+++ glibc-2.12.patch2010-05-22 10:20:12 UTC (rev 80795)
@@ -0,0 +1,99 @@
+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 @@
+ ],
+ GLIBC_VERSION=2.10)
+ 
++AC_EGREP_CPP([GLIBC_212], [
++#include features.h
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2  __GLIBC_MINOR__ == 12)
++  GLIBC_212
++ #endif
++#endif
++],
++GLIBC_VERSION=2.12)
++
+ AC_EGREP_CPP([AIX5_LIBC], [
+ #include standards.h
+ #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || 
defined(_AIXVERSION_530)
+@@ -741,6 +751,13 @@
+