1 --- valgrind-3.3.0/configure.in.jj 2008-04-16 05:48:10.000000000 -0400
2 +++ valgrind-3.3.0/configure.in 2008-04-16 05:54:04.000000000 -0400
3 @@ -471,6 +471,16 @@ AC_EGREP_CPP([GLIBC_27], [
7 +AC_EGREP_CPP([GLIBC_28], [
9 +#ifdef __GNU_LIBRARY__
10 + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 8)
17 AC_EGREP_CPP([AIX5_LIBC], [
18 #include <standards.h>
19 #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
20 @@ -521,6 +531,12 @@ case "${libc}" in
21 DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
22 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
25 + AC_MSG_RESULT(2.8 family)
26 + AC_DEFINE([GLIBC_2_8], 1, [Define to 1 if you're using glibc 2.8.x])
27 + DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
28 + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
31 AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
32 AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
33 @@ -529,7 +545,7 @@ case "${libc}" in
36 AC_MSG_RESULT(unsupported version)
37 - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7])
38 + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.8])
39 AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 libc])
42 --- valgrind-3.3.0/glibc-2.8.supp.jj 2008-04-16 05:50:23.000000000 -0400
43 +++ valgrind-3.3.0/glibc-2.8.supp 2008-04-16 05:50:35.000000000 -0400
46 +# Errors to suppress by default with glibc 2.8.x
48 +# Format of this file is:
50 +# name_of_suppression
51 +# tool_name:supp_kind
52 +# (optional extra info for some suppression types)
53 +# caller0 name, or /name/of/so/file.so
54 +# caller1 name, or ditto
55 +# (optionally: caller2 name)
56 +# (optionally: caller3 name)
59 +# For Memcheck, the supp_kinds are:
61 +# Param Value1 Value2 Value4 Value8 Value16 Jump
62 +# Free Addr1 Addr2 Addr4 Addr8 Addr16
63 +# Cond (previously known as Value0)
65 +# and the optional extra info is:
66 +# if Param: name of system call param
78 + obj:/lib*/ld-2.8*.so*
79 + obj:/lib*/ld-2.8*.so*
80 + obj:/lib*/ld-2.8*.so*
82 --- valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp.jj 2008-04-16 05:48:10.000000000 -0400
83 +++ valgrind-3.3.0/glibc-2.34567-NPTL-helgrind.supp 2008-04-16 05:51:59.000000000 -0400
86 ##----------------------------------------------------------------------##
87 # Suppressions for the Helgrind tool when using
88 -# a glibc-2.{2,3,4,5,6} system
89 +# a glibc-2.{2,3,4,5,6,7,8} system
91 ######------------ glibc-2.5 specific ------------######
93 ## NB. This is the "reference set". Derived sets for
94 -## glibc 2.7, 2.6, 2.4 and 2.3 follow below.
95 +## glibc 2.8, 2.7, 2.6, 2.4 and 2.3 follow below.
103 +######------------ glibc-2.8 specific ---------######
106 + helgrind-glibc28-001
108 + obj:/lib*/ld-2.8.*so
109 + obj:/lib*/ld-2.8.*so
112 + helgrind-glibc28-003
114 + obj:/lib*/ld-2.8.*so
115 + obj:/lib*/libc-2.8.*so
116 + obj:/lib*/libc-2.8.*so
119 + helgrind-glibc28-004
121 + obj:/lib*/libc-2.8.*so
122 + obj:/lib*/libc-2.8.*so
125 + helgrind-glibc28-005
127 + obj:/lib*/libpthread-2.8.*so
128 + obj:/lib*/libpthread-2.8.*so
129 + obj:/lib*/libpthread-2.8.*so
132 + helgrind-glibc28-011
134 + obj:/lib*/libc-2.8.*so
135 + obj:/lib*/libpthread-2.8.*so
139 + helgrind-glibc28-101
141 + obj:/lib*/libpthread-2.8.*so
145 + helgrind-glibc28-102
147 + fun:mythread_wrapper
148 + obj:/lib*/libpthread-2.8.*so
151 + helgrind-glibc28-107
153 + obj:/lib*/libpthread-2.8.*so
157 + helgrind-glibc28-199
159 + fun:pthread_barrier_wait
162 ######------------ glibc-2.7 specific ---------######
165 --- valgrind-3.3.0/configure.jj 2008-04-16 05:48:10.000000000 -0400
166 +++ valgrind-3.3.0/configure 2008-04-16 05:54:08.000000000 -0400
167 @@ -4624,6 +4624,28 @@ cat confdefs.h >>conftest.$ac_ext
168 cat >>conftest.$ac_ext <<_ACEOF
169 /* end confdefs.h. */
171 +#include <features.h>
172 +#ifdef __GNU_LIBRARY__
173 + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 8)
179 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
180 + $EGREP "GLIBC_28" >/dev/null 2>&1; then
186 +cat >conftest.$ac_ext <<_ACEOF
189 +cat confdefs.h >>conftest.$ac_ext
190 +cat >>conftest.$ac_ext <<_ACEOF
191 +/* end confdefs.h. */
193 #include <standards.h>
194 #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
196 @@ -4710,6 +4732,17 @@ _ACEOF
197 DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
198 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
201 + echo "$as_me:$LINENO: result: 2.8 family" >&5
202 +echo "${ECHO_T}2.8 family" >&6
204 +cat >>confdefs.h <<\_ACEOF
208 + DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
209 + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
212 echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
213 echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
214 @@ -4724,8 +4757,8 @@ _ACEOF
216 echo "$as_me:$LINENO: result: unsupported version" >&5
217 echo "${ECHO_T}unsupported version" >&6
218 - { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.7" >&5
219 -echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.7" >&2;}
220 + { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.8" >&5
221 +echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.8" >&2;}
222 { (exit 1); exit 1; }; }
223 { { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 libc" >&5
224 echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 libc" >&2;}