Mark Wielaard 46403f
commit 3781ac11ff374b3517011c1710ec517d52f25cd2
Mark Wielaard 46403f
Author: tom <tom@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Mark Wielaard 46403f
Date:   Mon Jan 14 09:48:49 2013 +0000
Mark Wielaard 46403f
Mark Wielaard 46403f
    Accept glibc 2.17 as valid.
Mark Wielaard 46403f
    
Mark Wielaard 46403f
    
Mark Wielaard 46403f
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13228 a5019735-40e9-0310-863c-91ae7b9d1cf9
Mark Wielaard 46403f
Mark Wielaard 46403f
diff --git a/configure.in b/configure.in
Mark Wielaard 46403f
index e0fb12d..0f3b3df 100644
Mark Wielaard 46403f
--- a/configure.in
Mark Wielaard 46403f
+++ b/configure.in
Mark Wielaard 46403f
@@ -906,6 +906,13 @@ case "${GLIBC_VERSION}" in
Mark Wielaard 46403f
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
 	;;
Mark Wielaard 46403f
+     2.17)
Mark Wielaard 46403f
+	AC_MSG_RESULT(2.17 family)
Mark Wielaard 46403f
+	AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	;;
Mark Wielaard 46403f
      darwin)
Mark Wielaard 46403f
 	AC_MSG_RESULT(Darwin)
Mark Wielaard 46403f
 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
Mark Wielaard 46403f
@@ -919,7 +926,7 @@ case "${GLIBC_VERSION}" in
Mark Wielaard 46403f
 
Mark Wielaard 46403f
      *)
Mark Wielaard 46403f
 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
Mark Wielaard 46403f
-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
Mark Wielaard 46403f
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
Mark Wielaard 46403f
 	AC_MSG_ERROR([or Darwin libc])
Mark Wielaard 46403f
 	;;
Mark Wielaard 46403f
 esac
Mark Wielaard 46403f
diff -ur valgrind-3.8.1/config.h.in valgrind-3.8.1/config.h.in
Mark Wielaard 46403f
--- valgrind-3.8.1/config.h.in	2013-01-16 17:15:33.531018561 +0100
Mark Wielaard 46403f
+++ valgrind-3.8.1/config.h.in	2013-01-16 17:19:21.000000000 +0100
Mark Wielaard 46403f
@@ -48,6 +48,9 @@
Mark Wielaard 46403f
 /* Define to 1 if you're using glibc 2.16.x */
Mark Wielaard 46403f
 #undef GLIBC_2_16
Mark Wielaard 46403f
 
Mark Wielaard 46403f
+/* Define to 1 if you're using glibc 2.17.x */
Mark Wielaard 46403f
+#undef GLIBC_2_17
Mark Wielaard 46403f
+
Mark Wielaard 46403f
 /* Define to 1 if you're using glibc 2.2.x */
Mark Wielaard 46403f
 #undef GLIBC_2_2
Mark Wielaard 46403f
 
Mark Wielaard 46403f
diff -ur valgrind-3.8.1/configure valgrind-3.8.1/configure
Mark Wielaard 46403f
--- valgrind-3.8.1/configure	2013-01-16 17:15:33.563018480 +0100
Mark Wielaard 46403f
+++ valgrind-3.8.1/configure	2013-01-16 17:19:21.373643238 +0100
Mark Wielaard 46403f
@@ -6610,6 +6610,16 @@
Mark Wielaard 46403f
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
 	;;
Mark Wielaard 46403f
+     2.17)
Mark Wielaard 46403f
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
Mark Wielaard 46403f
+$as_echo "2.17 family" >&6; }
Mark Wielaard 46403f
+
Mark Wielaard 46403f
+$as_echo "#define GLIBC_2_17 1" >>confdefs.h
Mark Wielaard 46403f
+
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Mark Wielaard 46403f
+	;;
Mark Wielaard 46403f
      darwin)
Mark Wielaard 46403f
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
Mark Wielaard 46403f
 $as_echo "Darwin" >&6; }
Mark Wielaard 46403f
@@ -6630,7 +6640,7 @@
Mark Wielaard 46403f
      *)
Mark Wielaard 46403f
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
Mark Wielaard 46403f
 $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
Mark Wielaard 46403f
-	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
Mark Wielaard 46403f
+	as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
Mark Wielaard 46403f
 	as_fn_error "or Darwin libc" "$LINENO" 5
Mark Wielaard 46403f
 	;;
Mark Wielaard 46403f
 esac