Jakub Jelinek 81c97a
--- valgrind-3.7.0/configure.in.jj	2011-11-05 12:13:30.000000000 +0100
Jakub Jelinek 81c97a
+++ valgrind-3.7.0/configure.in	2011-12-09 17:48:21.409848842 +0100
Jakub Jelinek 81c97a
@@ -775,6 +775,13 @@ case "${GLIBC_VERSION}" in
Jakub Jelinek 81c97a
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
 	;;
Jakub Jelinek 81c97a
+     2.15)
Jakub Jelinek 81c97a
+	AC_MSG_RESULT(2.15 family)
Jakub Jelinek 81c97a
+	AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	;;
Jakub Jelinek 81c97a
      darwin)
Jakub Jelinek 81c97a
 	AC_MSG_RESULT(Darwin)
Jakub Jelinek 81c97a
 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
Jakub Jelinek 81c97a
@@ -788,7 +795,7 @@ case "${GLIBC_VERSION}" in
Jakub Jelinek 81c97a
 
Jakub Jelinek 81c97a
      *)
Jakub Jelinek 81c97a
 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
Jakub Jelinek 81c97a
-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
Jakub Jelinek 81c97a
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15])
Jakub Jelinek 81c97a
 	AC_MSG_ERROR([or Darwin libc])
Jakub Jelinek 81c97a
 	;;
Jakub Jelinek 81c97a
 esac
Jakub Jelinek 81c97a
--- valgrind-3.7.0/config.h.in.jj	2011-10-26 23:25:55.000000000 +0200
Jakub Jelinek 81c97a
+++ valgrind-3.7.0/config.h.in	2011-12-09 17:47:42.385804043 +0100
Jakub Jelinek 81c97a
@@ -39,6 +39,9 @@
Jakub Jelinek 81c97a
 /* Define to 1 if you're using glibc 2.14.x */
Jakub Jelinek 81c97a
 #undef GLIBC_2_14
Jakub Jelinek 81c97a
 
Jakub Jelinek 81c97a
+/* Define to 1 if you're using glibc 2.15.x */
Jakub Jelinek 81c97a
+#undef GLIBC_2_15
Jakub Jelinek 81c97a
+
Jakub Jelinek 81c97a
 /* Define to 1 if you're using glibc 2.2.x */
Jakub Jelinek 81c97a
 #undef GLIBC_2_2
Jakub Jelinek 81c97a
 
Jakub Jelinek 81c97a
--- valgrind-3.7.0/configure.jj	2011-11-05 12:24:39.000000000 +0100
Jakub Jelinek 81c97a
+++ valgrind-3.7.0/configure	2011-12-09 17:48:58.371930777 +0100
Jakub Jelinek 81c97a
@@ -6402,6 +6402,16 @@ $as_echo "#define GLIBC_2_14 1" >>confde
Jakub Jelinek 81c97a
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
 	;;
Jakub Jelinek 81c97a
+     2.15)
Jakub Jelinek 81c97a
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
Jakub Jelinek 81c97a
+$as_echo "2.15 family" >&6; }
Jakub Jelinek 81c97a
+
Jakub Jelinek 81c97a
+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
Jakub Jelinek 81c97a
+
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
Jakub Jelinek 81c97a
+	;;
Jakub Jelinek 81c97a
      darwin)
Jakub Jelinek 81c97a
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
Jakub Jelinek 81c97a
 $as_echo "Darwin" >&6; }
Jakub Jelinek 81c97a
@@ -6422,7 +6432,7 @@ $as_echo "#define BIONIC_LIBC 1" >>confd
Jakub Jelinek 81c97a
      *)
Jakub Jelinek 81c97a
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
Jakub Jelinek 81c97a
 $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
Jakub Jelinek 81c97a
-	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
Jakub Jelinek 81c97a
+	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
Jakub Jelinek 81c97a
 	as_fn_error "or Darwin libc" "$LINENO" 5
Jakub Jelinek 81c97a
 	;;
Jakub Jelinek 81c97a
 esac