| 1 |
--- valgrind/configure.in.jj 2009-08-19 15:37:48.000000000 +0200 |
| 2 |
+++ valgrind/configure.in 2009-11-04 08:37:09.820077680 +0100 |
| 3 |
@@ -656,6 +656,16 @@ AC_EGREP_CPP([GLIBC_210], [ |
| 4 |
], |
| 5 |
GLIBC_VERSION="2.10") |
| 6 |
|
| 7 |
+AC_EGREP_CPP([GLIBC_211], [ |
| 8 |
+#include <features.h> |
| 9 |
+#ifdef __GNU_LIBRARY__ |
| 10 |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) |
| 11 |
+ GLIBC_211 |
| 12 |
+ #endif |
| 13 |
+#endif |
| 14 |
+], |
| 15 |
+GLIBC_VERSION="2.11") |
| 16 |
+ |
| 17 |
AC_EGREP_CPP([AIX5_LIBC], [ |
| 18 |
#include <standards.h> |
| 19 |
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) |
| 20 |
@@ -742,6 +752,13 @@ case "${GLIBC_VERSION}" in |
| 21 |
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 22 |
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 23 |
;; |
| 24 |
+ 2.11) |
| 25 |
+ AC_MSG_RESULT(2.11 family) |
| 26 |
+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) |
| 27 |
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 28 |
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 29 |
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 30 |
+ ;; |
| 31 |
aix5) |
| 32 |
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) |
| 33 |
AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) |
| 34 |
@@ -755,7 +772,7 @@ case "${GLIBC_VERSION}" in |
| 35 |
|
| 36 |
*) |
| 37 |
AC_MSG_RESULT(unsupported version) |
| 38 |
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) |
| 39 |
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) |
| 40 |
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) |
| 41 |
AC_MSG_ERROR([or Darwin libc]) |
| 42 |
;; |
| 43 |
--- valgrind/config.h.in.jj 2009-08-19 15:39:05.000000000 +0200 |
| 44 |
+++ valgrind/config.h.in 2009-11-04 08:38:36.051072661 +0100 |
| 45 |
@@ -15,6 +15,9 @@ |
| 46 |
/* Define to 1 if you're using glibc 2.10.x */ |
| 47 |
#undef GLIBC_2_10 |
| 48 |
|
| 49 |
+/* Define to 1 if you're using glibc 2.11.x */ |
| 50 |
+#undef GLIBC_2_11 |
| 51 |
+ |
| 52 |
/* Define to 1 if you're using glibc 2.2.x */ |
| 53 |
#undef GLIBC_2_2 |
| 54 |
|
| 55 |
--- valgrind/configure.jj 2009-08-19 15:44:07.000000000 +0200 |
| 56 |
+++ valgrind/configure 2009-11-04 08:38:08.421433252 +0100 |
| 57 |
@@ -5025,6 +5025,28 @@ cat confdefs.h >>conftest.$ac_ext |
| 58 |
cat >>conftest.$ac_ext <<_ACEOF |
| 59 |
/* end confdefs.h. */ |
| 60 |
|
| 61 |
+#include <features.h> |
| 62 |
+#ifdef __GNU_LIBRARY__ |
| 63 |
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) |
| 64 |
+ GLIBC_211 |
| 65 |
+ #endif |
| 66 |
+#endif |
| 67 |
+ |
| 68 |
+_ACEOF |
| 69 |
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
| 70 |
+ $EGREP "GLIBC_211" >/dev/null 2>&1; then |
| 71 |
+ GLIBC_VERSION="2.11" |
| 72 |
+fi |
| 73 |
+rm -f conftest* |
| 74 |
+ |
| 75 |
+ |
| 76 |
+cat >conftest.$ac_ext <<_ACEOF |
| 77 |
+/* confdefs.h. */ |
| 78 |
+_ACEOF |
| 79 |
+cat confdefs.h >>conftest.$ac_ext |
| 80 |
+cat >>conftest.$ac_ext <<_ACEOF |
| 81 |
+/* end confdefs.h. */ |
| 82 |
+ |
| 83 |
#include <standards.h> |
| 84 |
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) |
| 85 |
AIX5_LIBC |
| 86 |
@@ -5174,6 +5196,18 @@ _ACEOF |
| 87 |
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 88 |
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 89 |
;; |
| 90 |
+ 2.11) |
| 91 |
+ echo "$as_me:$LINENO: result: 2.11 family" >&5 |
| 92 |
+echo "${ECHO_T}2.11 family" >&6 |
| 93 |
+ |
| 94 |
+cat >>confdefs.h <<\_ACEOF |
| 95 |
+#define GLIBC_2_11 1 |
| 96 |
+_ACEOF |
| 97 |
+ |
| 98 |
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 99 |
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 100 |
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 101 |
+ ;; |
| 102 |
aix5) |
| 103 |
echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5 |
| 104 |
echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6 |
| 105 |
@@ -5198,8 +5232,8 @@ _ACEOF |
| 106 |
*) |
| 107 |
echo "$as_me:$LINENO: result: unsupported version" >&5 |
| 108 |
echo "${ECHO_T}unsupported version" >&6 |
| 109 |
- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5 |
| 110 |
-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;} |
| 111 |
+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11" >&5 |
| 112 |
+echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.11" >&2;} |
| 113 |
{ (exit 1); exit 1; }; } |
| 114 |
{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5 |
| 115 |
echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&2;} |
Parent Directory
| 
Revision Log