]>
Commit | Line | Data |
---|---|---|
e86f9d71 AM |
1 | diff -ruN valgrind-3.2.3/configure.in valgrind-3.2.3-fixed/configure.in |
2 | --- valgrind-3.2.3/configure.in 2007-07-17 19:32:42.956775000 +0200 | |
3 | +++ valgrind-3.2.3-fixed/configure.in 2007-07-17 19:34:18.042194471 +0200 | |
4 | @@ -359,6 +359,16 @@ | |
5 | ], | |
6 | glibc="2.6") | |
7 | ||
8 | +AC_EGREP_CPP([GLIBC_27], [ | |
9 | +#include <features.h> | |
10 | +#ifdef __GNU_LIBRARY__ | |
11 | + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7) | |
12 | + GLIBC_27 | |
13 | + #endif | |
14 | +#endif | |
15 | +], | |
16 | +glibc="2.7") | |
17 | + | |
18 | AC_MSG_CHECKING([the glibc version]) | |
19 | ||
20 | case "${glibc}" in | |
21 | @@ -386,9 +396,15 @@ | |
22 | DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" | |
23 | ;; | |
24 | ||
25 | + 2.7) | |
26 | + AC_MSG_RESULT(2.7 family) | |
27 | + AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x]) | |
28 | + DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}" | |
29 | + ;; | |
30 | + | |
31 | *) | |
32 | AC_MSG_RESULT(unsupported version) | |
33 | - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6]) | |
34 | + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7]) | |
35 | ;; | |
36 | esac | |
37 | ||
38 | diff -ruN valgrind-3.2.3/glibc-2.7.supp valgrind-3.2.3-fixed/glibc-2.7.supp | |
39 | --- valgrind-3.2.3/glibc-2.7.supp 1970-01-01 01:00:00.000000000 +0100 | |
40 | +++ valgrind-3.2.3-fixed/glibc-2.7.supp 2007-07-17 19:34:18.042194471 +0200 | |
41 | @@ -0,0 +1,216 @@ | |
42 | + | |
43 | +##----------------------------------------------------------------------## | |
44 | + | |
45 | +# Errors to suppress by default with glibc 2.4.x | |
46 | + | |
47 | +# Format of this file is: | |
48 | +# { | |
49 | +# name_of_suppression | |
50 | +# tool_name:supp_kind | |
51 | +# (optional extra info for some suppression types) | |
52 | +# caller0 name, or /name/of/so/file.so | |
53 | +# caller1 name, or ditto | |
54 | +# (optionally: caller2 name) | |
55 | +# (optionally: caller3 name) | |
56 | +# } | |
57 | +# | |
58 | +# For Memcheck, the supp_kinds are: | |
59 | +# | |
60 | +# Param Value1 Value2 Value4 Value8 Value16 | |
61 | +# Free Addr1 Addr2 Addr4 Addr8 Addr16 | |
62 | +# Cond (previously known as Value0) | |
63 | +# | |
64 | +# and the optional extra info is: | |
65 | +# if Param: name of system call param | |
66 | +# if Free: name of free-ing fn) | |
67 | + | |
68 | +{ | |
69 | + dl-hack1 | |
70 | + Memcheck:Cond | |
71 | + fun:_dl_start | |
72 | + fun:_start | |
73 | +} | |
74 | + | |
75 | +{ | |
76 | + dl-hack2 | |
77 | + Memcheck:Cond | |
78 | + obj:/lib*/ld-2.6*.so | |
79 | + obj:/lib*/ld-2.6*.so | |
80 | + obj:/lib*/ld-2.6*.so | |
81 | + obj:/lib*/ld-2.6*.so | |
82 | +} | |
83 | + | |
84 | +{ | |
85 | + dl-hack3 | |
86 | + Memcheck:Cond | |
87 | + obj:/lib*/ld-2.6*so* | |
88 | + obj:/lib*/ld-2.6*so* | |
89 | + obj:/lib*/ld-2.6*so* | |
90 | +} | |
91 | + | |
92 | +##----------------------------------------------------------------------## | |
93 | +{ | |
94 | + glibc-2.5.x-on-SUSE-10.2-(PPC)-1 | |
95 | + Memcheck:Cond | |
96 | + fun:_dl_start_final | |
97 | + fun:_dl_start | |
98 | + fun:_start | |
99 | +} | |
100 | +{ | |
101 | + glibc-2.5.x-on-SUSE-10.2-(PPC)-2a | |
102 | + Memcheck:Cond | |
103 | + fun:index | |
104 | + obj:*ld-2.6.*.so | |
105 | +} | |
106 | +{ | |
107 | + glibc-2.5.x-on-SuSE-10.2-(PPC)-2b | |
108 | + Memcheck:Addr4 | |
109 | + fun:index | |
110 | + fun:expand_dynamic_string_token | |
111 | +} | |
112 | +{ | |
113 | + glibc-2.5.5-on-SuSE-10.2-(PPC)-2c | |
114 | + Memcheck:Addr4 | |
115 | + fun:index | |
116 | + obj:*ld-2.6.*.so | |
117 | +} | |
118 | +{ | |
119 | + glibc-2.3.5-on-SuSE-10.1-(PPC)-3 | |
120 | + Memcheck:Addr4 | |
121 | + fun:*wordcopy_fwd_dest_aligned* | |
122 | + fun:mem*cpy | |
123 | + obj:*lib*2.6.*.so | |
124 | +} | |
125 | + | |
126 | +##----------------------------------------------------------------------## | |
127 | +## Various structure padding things on SUSE 10.2 | |
128 | +## | |
129 | +{ | |
130 | + X11-64bit-padding-1a | |
131 | + Memcheck:Param | |
132 | + write(buf) | |
133 | + fun:__write_nocancel | |
134 | + obj:/usr/lib*/libX11.so* | |
135 | + obj:/usr/lib*/libX11.so* | |
136 | + fun:X* | |
137 | +} | |
138 | +{ | |
139 | + X11-64bit-padding-1b | |
140 | + Memcheck:Param | |
141 | + write(buf) | |
142 | + fun:__write_nocancel | |
143 | + obj:/usr/lib*/libX11.so* | |
144 | + obj:/usr/lib*/libX11.so* | |
145 | + fun:_X* | |
146 | +} | |
147 | +{ | |
148 | + X11-64bit-padding-1c | |
149 | + Memcheck:Param | |
150 | + write(buf) | |
151 | + fun:__write_nocancel | |
152 | + obj:/usr/lib*/libX11.so* | |
153 | + obj:/usr/lib*/libX11.so* | |
154 | + obj:/usr/lib*/libX11.so* | |
155 | +} | |
156 | +{ | |
157 | + X11-64bit-padding-1d | |
158 | + Memcheck:Param | |
159 | + write(buf) | |
160 | + fun:__write_nocancel | |
161 | + obj:/usr/lib*/libICE.so* | |
162 | + obj:/usr/lib*/libICE.so* | |
163 | + obj:/usr/lib*/libICE.so* | |
164 | +} | |
165 | +{ | |
166 | + X11-64bit-padding-2a | |
167 | + Memcheck:Param | |
168 | + writev(vector[...]) | |
169 | + fun:do_writev | |
170 | + obj:/usr/lib*/libX11.so* | |
171 | + obj:/usr/lib*/libX11.so* | |
172 | + obj:/usr/lib*/libX11.so* | |
173 | +} | |
174 | +{ | |
175 | + X11-64bit-padding-2b | |
176 | + Memcheck:Param | |
177 | + writev(vector[...]) | |
178 | + fun:do_writev | |
179 | + fun:writev | |
180 | + obj:/usr/lib*/libX11.so* | |
181 | + obj:/usr/lib*/libX11.so* | |
182 | +} | |
183 | + | |
184 | +{ | |
185 | + glibc24-64bit-padding-1a | |
186 | + Memcheck:Param | |
187 | + socketcall.sendto(msg) | |
188 | + fun:send | |
189 | + fun:get_mapping | |
190 | + fun:__nscd_get_map_ref | |
191 | + fun:nscd* | |
192 | +} | |
193 | +{ | |
194 | + glibc24-64bit-padding-1b | |
195 | + Memcheck:Param | |
196 | + socketcall.sendto(msg) | |
197 | + fun:__sendto_nocancel | |
198 | + obj:/*libc-2.6.so | |
199 | + obj:/*libc-2.6.so | |
200 | + obj:/*libc-2.6.so | |
201 | +} | |
202 | +{ | |
203 | + glibc24-64bit-padding-1c | |
204 | + Memcheck:Param | |
205 | + socketcall.send(msg) | |
206 | + fun:send | |
207 | + fun:__nscd_get_map_ref | |
208 | + fun:nscd_get*_r | |
209 | + fun:*nscd* | |
210 | + obj:/*libc-2.6.so | |
211 | +} | |
212 | + | |
213 | + | |
214 | +{ | |
215 | + X11-64bit-padding-3a | |
216 | + Memcheck:Param | |
217 | + write(buf) | |
218 | + obj:/*libpthread-2.4.so* | |
219 | + obj:/usr/lib*/libX11.so* | |
220 | + obj:/usr/lib*/libX11.so* | |
221 | + obj:/usr/lib*/libX11.so* | |
222 | +} | |
223 | + | |
224 | +{ | |
225 | + X11-64bit-padding-4a | |
226 | + Memcheck:Param | |
227 | + socketcall.sendto(msg) | |
228 | + fun:send | |
229 | + obj:/*libc-2.6.so | |
230 | + obj:/*libc-2.6.so | |
231 | + obj:/*libc-2.6.so | |
232 | +} | |
233 | +{ | |
234 | + X11-64bit-padding-4b | |
235 | + Memcheck:Param | |
236 | + socketcall.send(msg) | |
237 | + fun:send | |
238 | + obj:/*libc-2.6.so | |
239 | + obj:/*libc-2.6.so | |
240 | + obj:/*libc-2.6.so | |
241 | +} | |
242 | + | |
243 | +##----------------------------------------------------------------------## | |
244 | +# MontaVista Linux 4.0.1 on ppc32 | |
245 | +{ | |
246 | + MVL-401-linuxthreads-pthread_create | |
247 | + Memcheck:Param | |
248 | + write(buf) | |
249 | + fun:pthread_create | |
250 | +} | |
251 | +{ | |
252 | + MVL-401-linuxthreads-pthread_create | |
253 | + Memcheck:Param | |
254 | + write(buf) | |
255 | + obj:/lib/libpthread-0.10.so | |
256 | + fun:pthread_create | |
257 | +} | |
258 | diff -ruN valgrind-3.2.3/Makefile.am valgrind-3.2.3-fixed/Makefile.am | |
259 | --- valgrind-3.2.3/Makefile.am 2007-01-02 15:52:30.000000000 +0100 | |
260 | +++ valgrind-3.2.3-fixed/Makefile.am 2007-07-17 19:35:03.672794808 +0200 | |
261 | @@ -17,7 +17,7 @@ | |
262 | DIST_SUBDIRS = $(SUBDIRS) | |
263 | ||
264 | SUPP_FILES = \ | |
265 | - glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \ | |
266 | + glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp glibc-2.7.supp \ | |
267 | xfree-3.supp xfree-4.supp | |
268 | ||
269 | dist_val_DATA = $(SUPP_FILES) default.supp |