From: Julian Seward <jseward@acm.org>
Date: Wed, 10 Sep 2014 20:05:55 +0000 (+0000)
Subject: Merge r14505 from trunk (Accept glibc 2.20 as valid.)
X-Git-Tag: svn/VALGRIND_3_10_0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a74e6a5400b9b1e8e185cee6dae52fe5b635df;p=thirdparty%2Fvalgrind.git

Merge r14505 from trunk (Accept glibc 2.20 as valid.)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14509
---

diff --git a/configure.ac b/configure.ac
index 09abe3010e..429aa05ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1008,6 +1008,13 @@ case "${GLIBC_VERSION}" in
 	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])