|
 |
9938e9f |
--- valgrind/configure.in.jj 2010-05-04 17:19:22.000000000 -0400
|
|
|
9938e9f |
+++ valgrind/configure.in 2010-05-04 17:23:06.691274000 -0400
|
|
|
9938e9f |
@@ -666,6 +666,16 @@ AC_EGREP_CPP([GLIBC_211], [
|
|
|
9938e9f |
],
|
|
|
9938e9f |
GLIBC_VERSION="2.11")
|
|
|
9938e9f |
|
|
|
9938e9f |
+AC_EGREP_CPP([GLIBC_212], [
|
|
|
9938e9f |
+#include <features.h>
|
|
|
9938e9f |
+#ifdef __GNU_LIBRARY__
|
|
|
9938e9f |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
|
|
|
9938e9f |
+ GLIBC_212
|
|
|
9938e9f |
+ #endif
|
|
|
9938e9f |
+#endif
|
|
|
9938e9f |
+],
|
|
|
9938e9f |
+GLIBC_VERSION="2.12")
|
|
|
9938e9f |
+
|
|
|
9938e9f |
AC_EGREP_CPP([AIX5_LIBC], [
|
|
|
9938e9f |
#include <standards.h>
|
|
|
9938e9f |
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
|
|
|
9938e9f |
@@ -759,6 +769,13 @@ case "${GLIBC_VERSION}" in
|
|
|
9938e9f |
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
;;
|
|
|
9938e9f |
+ 2.12)
|
|
|
9938e9f |
+ AC_MSG_RESULT(2.12 family)
|
|
|
9938e9f |
+ AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x])
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ ;;
|
|
|
9938e9f |
aix5)
|
|
|
9938e9f |
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
|
|
|
9938e9f |
AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
|
|
|
9938e9f |
@@ -772,7 +789,7 @@ case "${GLIBC_VERSION}" in
|
|
|
9938e9f |
|
|
|
9938e9f |
*)
|
|
|
9938e9f |
AC_MSG_RESULT(unsupported version)
|
|
|
9938e9f |
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
|
|
|
9938e9f |
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12])
|
|
|
9938e9f |
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
|
|
|
9938e9f |
AC_MSG_ERROR([or Darwin libc])
|
|
|
9938e9f |
;;
|
|
|
9938e9f |
--- valgrind/config.h.in.jj 2010-05-04 17:19:22.000000000 -0400
|
|
|
9938e9f |
+++ valgrind/config.h.in 2010-05-04 17:23:37.788211000 -0400
|
|
|
9938e9f |
@@ -18,6 +18,9 @@
|
|
|
9938e9f |
/* Define to 1 if you're using glibc 2.11.x */
|
|
|
9938e9f |
#undef GLIBC_2_11
|
|
|
9938e9f |
|
|
|
9938e9f |
+/* Define to 1 if you're using glibc 2.12.x */
|
|
|
9938e9f |
+#undef GLIBC_2_12
|
|
|
9938e9f |
+
|
|
|
9938e9f |
/* Define to 1 if you're using glibc 2.2.x */
|
|
|
9938e9f |
#undef GLIBC_2_2
|
|
|
9938e9f |
|
|
|
9938e9f |
--- valgrind/configure.jj 2010-05-04 17:19:22.000000000 -0400
|
|
|
9938e9f |
+++ valgrind/configure 2010-05-04 17:24:45.271471000 -0400
|
|
|
9938e9f |
@@ -5047,6 +5047,28 @@ cat confdefs.h >>conftest.$ac_ext
|
|
|
9938e9f |
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
9938e9f |
/* end confdefs.h. */
|
|
|
9938e9f |
|
|
|
9938e9f |
+#include <features.h>
|
|
|
9938e9f |
+#ifdef __GNU_LIBRARY__
|
|
|
9938e9f |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
|
|
|
9938e9f |
+ GLIBC_212
|
|
|
9938e9f |
+ #endif
|
|
|
9938e9f |
+#endif
|
|
|
9938e9f |
+
|
|
|
9938e9f |
+_ACEOF
|
|
|
9938e9f |
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
|
9938e9f |
+ $EGREP "GLIBC_212" >/dev/null 2>&1; then
|
|
|
9938e9f |
+ GLIBC_VERSION="2.12"
|
|
|
9938e9f |
+fi
|
|
|
9938e9f |
+rm -f conftest*
|
|
|
9938e9f |
+
|
|
|
9938e9f |
+
|
|
|
9938e9f |
+cat >conftest.$ac_ext <<_ACEOF
|
|
|
9938e9f |
+/* confdefs.h. */
|
|
|
9938e9f |
+_ACEOF
|
|
|
9938e9f |
+cat confdefs.h >>conftest.$ac_ext
|
|
|
9938e9f |
+cat >>conftest.$ac_ext <<_ACEOF
|
|
|
9938e9f |
+/* end confdefs.h. */
|
|
|
9938e9f |
+
|
|
|
9938e9f |
#include <standards.h>
|
|
|
9938e9f |
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
|
|
|
9938e9f |
AIX5_LIBC
|
|
|
9938e9f |
@@ -5208,6 +5230,18 @@ _ACEOF
|
|
|
9938e9f |
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
;;
|
|
|
9938e9f |
+ 2.12)
|
|
|
9938e9f |
+ echo "$as_me:$LINENO: result: 2.12 family" >&5
|
|
|
9938e9f |
+echo "${ECHO_T}2.12 family" >&6
|
|
|
9938e9f |
+
|
|
|
9938e9f |
+cat >>confdefs.h <<\_ACEOF
|
|
|
9938e9f |
+#define GLIBC_2_12 1
|
|
|
9938e9f |
+_ACEOF
|
|
|
9938e9f |
+
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
|
|
9938e9f |
+ ;;
|
|
|
9938e9f |
aix5)
|
|
|
9938e9f |
echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
|
|
|
9938e9f |
echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
|
|
|
9938e9f |
@@ -5232,8 +5266,8 @@ _ACEOF
|
|
|
9938e9f |
*)
|
|
|
9938e9f |
echo "$as_me:$LINENO: result: unsupported version" >&5
|
|
|
9938e9f |
echo "${ECHO_T}unsupported version" >&6
|
|
|
9938e9f |
- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11" >&5
|
|
|
9938e9f |
-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.11" >&2;}
|
|
|
9938e9f |
+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.12" >&5
|
|
|
9938e9f |
+echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.12" >&2;}
|
|
|
9938e9f |
{ (exit 1); exit 1; }; }
|
|
|
9938e9f |
{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5
|
|
|
9938e9f |
echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&2;}
|