From 1e1bb14fd42f91d0330af8674cec0ed72742866e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Sep 09 2014 07:43:27 +0000
Subject: Recognize glibc 2.20 final. valgrind-3.10-configure-glibc-2.20.patch


---

diff --git a/valgrind-3.10-configure-glibc-2.20.patch b/valgrind-3.10-configure-glibc-2.20.patch
new file mode 100644
index 0000000..aa61382
--- /dev/null
+++ b/valgrind-3.10-configure-glibc-2.20.patch
@@ -0,0 +1,52 @@
+Only in valgrind-3.10.0.BETA2: autom4te.cache
+diff -ur valgrind-3.10.0.BETA2.orig/config.h.in valgrind-3.10.0.BETA2/config.h.in
+--- valgrind-3.10.0.BETA2.orig/config.h.in	2014-09-09 09:17:54.112654934 +0200
++++ valgrind-3.10.0.BETA2/config.h.in	2014-09-09 09:35:38.000000000 +0200
+@@ -66,6 +66,9 @@
+ /* Define to 1 if you're using glibc 2.2.x */
+ #undef GLIBC_2_2
+ 
++/* Define to 1 if you're using glibc 2.20.x */
++#undef GLIBC_2_20
++
+ /* Define to 1 if you're using glibc 2.3.x */
+ #undef GLIBC_2_3
+ 
+Only in valgrind-3.10.0.BETA2: config.h.in~
+diff -ur valgrind-3.10.0.BETA2.orig/configure valgrind-3.10.0.BETA2/configure
+--- valgrind-3.10.0.BETA2.orig/configure	2014-09-09 09:17:54.106654950 +0200
++++ valgrind-3.10.0.BETA2/configure	2014-09-09 09:35:43.280624261 +0200
+@@ -6828,6 +6828,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 -ur valgrind-3.10.0.BETA2.orig/configure.ac valgrind-3.10.0.BETA2/configure.ac
+--- valgrind-3.10.0.BETA2.orig/configure.ac	2014-09-09 09:17:54.132654881 +0200
++++ valgrind-3.10.0.BETA2/configure.ac	2014-09-09 09:33:31.944021414 +0200
+@@ -1008,6 +1008,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])
diff --git a/valgrind.spec b/valgrind.spec
index 152500a..58c7abd 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -48,6 +48,9 @@ Patch3: valgrind-3.9.0-stat_h.patch
 # Make ld.so supressions slightly less specific.
 Patch4: valgrind-3.9.0-ldso-supp.patch
 
+# Recognize glibc 2.20 final. Upstream valgrind svn r14505.
+Patch5: valgrind-3.10-configure-glibc-2.20.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -150,6 +153,7 @@ Valgrind User Manual for details.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -306,6 +310,7 @@ echo ===============END TESTING===============
 - Update to 3.10.0.BETA2.
 - Don't run dwz or generate minisymtab.
 - Remove valgrind-3.9.0-s390x-ld-supp.patch fixed upstream.
+- Add valgrind-3.10-configure-glibc-2.20.patch.
 
 * Tue Sep  2 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-0.1.BETA1
 - Update to official upstream 3.10.0 BETA1.