Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/
Date: Wed, 09 Aug 2017 12:19:01
Message-Id: 1502281109.d3cbd9d03ed37de94df83f45a4535ce3f7391542.blueness@gentoo
1 commit: d3cbd9d03ed37de94df83f45a4535ce3f7391542
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 9 09:11:30 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 9 12:18:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cbd9d0
7
8 dev-util/valgrind: remove unused patches
9
10 .../files/valgrind-3.10.1-glibc-2.21.patch | 17 ---
11 .../files/valgrind-3.10.1-glibc-2.22.patch | 17 ---
12 .../valgrind/files/valgrind-3.10.1-linux-4.patch | 29 ----
13 .../files/valgrind-3.10.1-non-exec-stack.patch | 148 --------------------
14 .../files/valgrind-3.11.0-non-exec-stack.patch | 154 ---------------------
15 .../files/valgrind-3.6.0-local-labels.patch | 24 ----
16 .../valgrind/files/valgrind-3.9.0-glibc-2.19.patch | 37 -----
17 7 files changed, 426 deletions(-)
18
19 diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
20 deleted file mode 100644
21 index 286e431b0dd..00000000000
22 --- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
23 +++ /dev/null
24 @@ -1,17 +0,0 @@
25 -diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
26 ---- valgrind-3.10.1.orig/configure.ac 2014-11-25 14:41:13.000000000 -0500
27 -+++ valgrind-3.10.1/configure.ac 2015-07-28 22:35:22.315604804 -0400
28 -@@ -1018,6 +1018,13 @@
29 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
30 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
31 - ;;
32 -+ 2.21)
33 -+ AC_MSG_RESULT(2.21 family)
34 -+ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
35 -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
36 -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
37 -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
38 -+ ;;
39 - darwin)
40 - AC_MSG_RESULT(Darwin)
41 - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
42
43 diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
44 deleted file mode 100644
45 index aa44aec4a57..00000000000
46 --- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
47 +++ /dev/null
48 @@ -1,17 +0,0 @@
49 -diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
50 ---- valgrind-3.10.1.orig/configure.ac 2016-04-16 04:24:22.285314910 -0400
51 -+++ valgrind-3.10.1/configure.ac 2016-04-16 04:39:03.437329726 -0400
52 -@@ -1032,6 +1032,13 @@
53 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
54 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
55 - ;;
56 -+ 2.22)
57 -+ AC_MSG_RESULT(2.22 family)
58 -+ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.x])
59 -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
60 -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
61 -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
62 -+ ;;
63 - darwin)
64 - AC_MSG_RESULT(Darwin)
65 - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
66
67 diff --git a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
68 deleted file mode 100644
69 index 63918c2c1d0..00000000000
70 --- a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
71 +++ /dev/null
72 @@ -1,29 +0,0 @@
73 -From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
74 -From: Janne Grunau <j@××××××.net>
75 -Date: Thu, 19 Mar 2015 22:44:51 +0100
76 -Subject: [PATCH 1/1] configure: support linux 4.*
77 -
78 -There is nothing special in linux 4.0. Handle it as another 3.* (or
79 -another 2.6.*) release. Compare changeset 14955 in valgrind's
80 -subversion repository. Valgrind trunk also drops support for linux 2.4
81 -but there is no need to do that for realeased software.
82 ----
83 - configure.ac | 2 +-
84 - 1 file changed, 1 insertion(+), 1 deletion(-)
85 -
86 -diff --git a/configure.ac b/configure.ac
87 -index 0fd2a41..33c7954 100644
88 ---- a/configure.ac
89 -+++ b/configure.ac
90 -@@ -303,7 +303,7 @@ case "${host_os}" in
91 - kernel=`uname -r`
92 -
93 - case "${kernel}" in
94 -- 2.6.*|3.*)
95 -+ 2.6.*|3.*|4.*)
96 - AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
97 - AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
98 - ;;
99 ---
100 -2.3.3
101 -
102
103 diff --git a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
104 deleted file mode 100644
105 index e25de99e790..00000000000
106 --- a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
107 +++ /dev/null
108 @@ -1,148 +0,0 @@
109 -diff -Naur valgrind-3.10.1.orig/coregrind/Makefile.am valgrind-3.10.1/coregrind/Makefile.am
110 ---- valgrind-3.10.1.orig/coregrind/Makefile.am 2014-11-25 14:41:19.000000000 -0500
111 -+++ valgrind-3.10.1/coregrind/Makefile.am 2014-11-26 13:36:44.113678744 -0500
112 -@@ -333,18 +333,6 @@
113 - m_demangle/demangle.c \
114 - m_demangle/dyn-string.c \
115 - m_demangle/safe-ctype.c \
116 -- m_dispatch/dispatch-x86-linux.S \
117 -- m_dispatch/dispatch-amd64-linux.S \
118 -- m_dispatch/dispatch-ppc32-linux.S \
119 -- m_dispatch/dispatch-ppc64be-linux.S \
120 -- m_dispatch/dispatch-ppc64le-linux.S \
121 -- m_dispatch/dispatch-arm-linux.S \
122 -- m_dispatch/dispatch-arm64-linux.S \
123 -- m_dispatch/dispatch-s390x-linux.S \
124 -- m_dispatch/dispatch-mips32-linux.S \
125 -- m_dispatch/dispatch-mips64-linux.S \
126 -- m_dispatch/dispatch-x86-darwin.S \
127 -- m_dispatch/dispatch-amd64-darwin.S \
128 - m_gdbserver/inferiors.c \
129 - m_gdbserver/m_gdbserver.c \
130 - m_gdbserver/regcache.c \
131 -@@ -368,8 +356,6 @@
132 - m_initimg/initimg-pathscan.c \
133 - m_mach/mach_basics.c \
134 - m_mach/mach_msg.c \
135 -- m_mach/mach_traps-x86-darwin.S \
136 -- m_mach/mach_traps-amd64-darwin.S \
137 - m_replacemalloc/replacemalloc_core.c \
138 - m_scheduler/scheduler.c \
139 - m_scheduler/sema.c \
140 -@@ -386,18 +372,6 @@
141 - m_sigframe/sigframe-mips64-linux.c \
142 - m_sigframe/sigframe-x86-darwin.c \
143 - m_sigframe/sigframe-amd64-darwin.c \
144 -- m_syswrap/syscall-x86-linux.S \
145 -- m_syswrap/syscall-amd64-linux.S \
146 -- m_syswrap/syscall-ppc32-linux.S \
147 -- m_syswrap/syscall-ppc64be-linux.S \
148 -- m_syswrap/syscall-ppc64le-linux.S \
149 -- m_syswrap/syscall-arm-linux.S \
150 -- m_syswrap/syscall-arm64-linux.S \
151 -- m_syswrap/syscall-s390x-linux.S \
152 -- m_syswrap/syscall-mips32-linux.S \
153 -- m_syswrap/syscall-mips64-linux.S \
154 -- m_syswrap/syscall-x86-darwin.S \
155 -- m_syswrap/syscall-amd64-darwin.S \
156 - m_syswrap/syswrap-main.c \
157 - m_syswrap/syswrap-generic.c \
158 - m_syswrap/syswrap-linux.c \
159 -@@ -420,6 +394,29 @@
160 - m_ume/main.c \
161 - m_ume/script.c
162 -
163 -+COREGRIND_SOURCES_COMMON += \
164 -+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
165 -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
166 -+
167 -+if VGCONF_HAVE_PLATFORM_SEC
168 -+COREGRIND_SOURCES_COMMON += \
169 -+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
170 -+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
171 -+endif
172 -+
173 -+if VGCONF_OS_IS_DARWIN
174 -+COREGRIND_SOURCES_COMMON += \
175 -+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
176 -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
177 -+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
178 -+if VGCONF_HAVE_PLATFORM_SEC
179 -+COREGRIND_SOURCES_COMMON += \
180 -+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
181 -+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
182 -+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
183 -+endif
184 -+endif
185 -+
186 - libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
187 - $(COREGRIND_SOURCES_COMMON)
188 - nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
189 -diff -Naur valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S
190 ---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2014-11-25 14:41:20.000000000 -0500
191 -+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-amd64-linux.S 2014-11-26 13:30:11.840660890 -0500
192 -@@ -249,11 +249,11 @@
193 -
194 - .size VG_(disp_run_translations), .-VG_(disp_run_translations)
195 -
196 -+#endif // defined(VGP_amd64_linux)
197 -+
198 - /* Let the linker know we don't need an executable stack */
199 - .section .note.GNU-stack,"",@progbits
200 -
201 --#endif // defined(VGP_amd64_linux)
202 --
203 - /*--------------------------------------------------------------------*/
204 - /*--- end ---*/
205 - /*--------------------------------------------------------------------*/
206 -diff -Naur valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S
207 ---- valgrind-3.10.1.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2014-11-25 14:41:20.000000000 -0500
208 -+++ valgrind-3.10.1/coregrind/m_dispatch/dispatch-x86-linux.S 2014-11-26 13:30:11.840660890 -0500
209 -@@ -240,11 +240,11 @@
210 -
211 - .size VG_(disp_run_translations), .-VG_(disp_run_translations)
212 -
213 -+#endif // defined(VGP_x86_linux)
214 -+
215 - /* Let the linker know we don't need an executable stack */
216 - .section .note.GNU-stack,"",@progbits
217 -
218 --#endif // defined(VGP_x86_linux)
219 --
220 - /*--------------------------------------------------------------------*/
221 - /*--- end ---*/
222 - /*--------------------------------------------------------------------*/
223 -diff -Naur valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S
224 ---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2014-11-25 14:41:20.000000000 -0500
225 -+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-amd64-linux.S 2014-11-26 13:30:11.840660890 -0500
226 -@@ -205,11 +205,11 @@
227 - ML_(blksys_finished): .quad 5b
228 - .previous
229 -
230 -+#endif // defined(VGP_amd64_linux)
231 -+
232 - /* Let the linker know we don't need an executable stack */
233 - .section .note.GNU-stack,"",@progbits
234 -
235 --#endif // defined(VGP_amd64_linux)
236 --
237 - /*--------------------------------------------------------------------*/
238 - /*--- end ---*/
239 - /*--------------------------------------------------------------------*/
240 -diff -Naur valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S
241 ---- valgrind-3.10.1.orig/coregrind/m_syswrap/syscall-x86-linux.S 2014-11-25 14:41:20.000000000 -0500
242 -+++ valgrind-3.10.1/coregrind/m_syswrap/syscall-x86-linux.S 2014-11-26 13:30:11.840660890 -0500
243 -@@ -165,11 +165,11 @@
244 - ML_(blksys_finished): .long 5b
245 - .previous
246 -
247 -+#endif // defined(VGP_x86_linux)
248 -+
249 - /* Let the linker know we don't need an executable stack */
250 - .section .note.GNU-stack,"",@progbits
251 -
252 --#endif // defined(VGP_x86_linux)
253 --
254 - /*--------------------------------------------------------------------*/
255 - /*--- end ---*/
256 - /*--------------------------------------------------------------------*/
257
258 diff --git a/dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch
259 deleted file mode 100644
260 index b5c151a8ed9..00000000000
261 --- a/dev-util/valgrind/files/valgrind-3.11.0-non-exec-stack.patch
262 +++ /dev/null
263 @@ -1,154 +0,0 @@
264 -diff -Naur valgrind-3.11.0.orig/coregrind/Makefile.am valgrind-3.11.0/coregrind/Makefile.am
265 ---- valgrind-3.11.0.orig/coregrind/Makefile.am 2015-09-08 09:23:26.000000000 -0400
266 -+++ valgrind-3.11.0/coregrind/Makefile.am 2015-09-26 06:52:04.226983707 -0400
267 -@@ -354,21 +354,6 @@
268 - m_demangle/demangle.c \
269 - m_demangle/dyn-string.c \
270 - m_demangle/safe-ctype.c \
271 -- m_dispatch/dispatch-x86-linux.S \
272 -- m_dispatch/dispatch-amd64-linux.S \
273 -- m_dispatch/dispatch-ppc32-linux.S \
274 -- m_dispatch/dispatch-ppc64be-linux.S \
275 -- m_dispatch/dispatch-ppc64le-linux.S \
276 -- m_dispatch/dispatch-arm-linux.S \
277 -- m_dispatch/dispatch-arm64-linux.S \
278 -- m_dispatch/dispatch-s390x-linux.S \
279 -- m_dispatch/dispatch-mips32-linux.S \
280 -- m_dispatch/dispatch-mips64-linux.S \
281 -- m_dispatch/dispatch-tilegx-linux.S \
282 -- m_dispatch/dispatch-x86-darwin.S \
283 -- m_dispatch/dispatch-amd64-darwin.S \
284 -- m_dispatch/dispatch-x86-solaris.S \
285 -- m_dispatch/dispatch-amd64-solaris.S \
286 - m_gdbserver/inferiors.c \
287 - m_gdbserver/m_gdbserver.c \
288 - m_gdbserver/regcache.c \
289 -@@ -394,8 +379,6 @@
290 - m_initimg/initimg-pathscan.c \
291 - m_mach/mach_basics.c \
292 - m_mach/mach_msg.c \
293 -- m_mach/mach_traps-x86-darwin.S \
294 -- m_mach/mach_traps-amd64-darwin.S \
295 - m_replacemalloc/replacemalloc_core.c \
296 - m_scheduler/sched-lock.c \
297 - m_scheduler/sched-lock-generic.c \
298 -@@ -415,21 +398,6 @@
299 - m_sigframe/sigframe-x86-darwin.c \
300 - m_sigframe/sigframe-amd64-darwin.c \
301 - m_sigframe/sigframe-solaris.c \
302 -- m_syswrap/syscall-x86-linux.S \
303 -- m_syswrap/syscall-amd64-linux.S \
304 -- m_syswrap/syscall-ppc32-linux.S \
305 -- m_syswrap/syscall-ppc64be-linux.S \
306 -- m_syswrap/syscall-ppc64le-linux.S \
307 -- m_syswrap/syscall-arm-linux.S \
308 -- m_syswrap/syscall-arm64-linux.S \
309 -- m_syswrap/syscall-s390x-linux.S \
310 -- m_syswrap/syscall-mips32-linux.S \
311 -- m_syswrap/syscall-mips64-linux.S \
312 -- m_syswrap/syscall-tilegx-linux.S \
313 -- m_syswrap/syscall-x86-darwin.S \
314 -- m_syswrap/syscall-amd64-darwin.S \
315 -- m_syswrap/syscall-x86-solaris.S \
316 -- m_syswrap/syscall-amd64-solaris.S \
317 - m_syswrap/syswrap-main.c \
318 - m_syswrap/syswrap-generic.c \
319 - m_syswrap/syswrap-linux.c \
320 -@@ -456,6 +424,29 @@
321 - m_ume/main.c \
322 - m_ume/script.c
323 -
324 -+COREGRIND_SOURCES_COMMON += \
325 -+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
326 -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
327 -+
328 -+if VGCONF_HAVE_PLATFORM_SEC
329 -+COREGRIND_SOURCES_COMMON += \
330 -+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
331 -+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
332 -+endif
333 -+
334 -+if VGCONF_OS_IS_DARWIN
335 -+COREGRIND_SOURCES_COMMON += \
336 -+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
337 -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
338 -+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
339 -+if VGCONF_HAVE_PLATFORM_SEC
340 -+COREGRIND_SOURCES_COMMON += \
341 -+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
342 -+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
343 -+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
344 -+endif
345 -+endif
346 -+
347 - libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
348 - $(COREGRIND_SOURCES_COMMON)
349 - nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
350 -diff -Naur valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.11.0/coregrind/m_dispatch/dispatch-amd64-linux.S
351 ---- valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2015-09-08 09:23:26.000000000 -0400
352 -+++ valgrind-3.11.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2015-09-26 06:46:20.103000200 -0400
353 -@@ -249,11 +249,11 @@
354 -
355 - .size VG_(disp_run_translations), .-VG_(disp_run_translations)
356 -
357 -+#endif // defined(VGP_amd64_linux)
358 -+
359 - /* Let the linker know we don't need an executable stack */
360 - .section .note.GNU-stack,"",@progbits
361 -
362 --#endif // defined(VGP_amd64_linux)
363 --
364 - /*--------------------------------------------------------------------*/
365 - /*--- end ---*/
366 - /*--------------------------------------------------------------------*/
367 -diff -Naur valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.11.0/coregrind/m_dispatch/dispatch-x86-linux.S
368 ---- valgrind-3.11.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2015-09-08 09:23:26.000000000 -0400
369 -+++ valgrind-3.11.0/coregrind/m_dispatch/dispatch-x86-linux.S 2015-09-26 06:46:20.103000200 -0400
370 -@@ -240,11 +240,11 @@
371 -
372 - .size VG_(disp_run_translations), .-VG_(disp_run_translations)
373 -
374 -+#endif // defined(VGP_x86_linux)
375 -+
376 - /* Let the linker know we don't need an executable stack */
377 - .section .note.GNU-stack,"",@progbits
378 -
379 --#endif // defined(VGP_x86_linux)
380 --
381 - /*--------------------------------------------------------------------*/
382 - /*--- end ---*/
383 - /*--------------------------------------------------------------------*/
384 -diff -Naur valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.11.0/coregrind/m_syswrap/syscall-amd64-linux.S
385 ---- valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2015-09-08 09:23:26.000000000 -0400
386 -+++ valgrind-3.11.0/coregrind/m_syswrap/syscall-amd64-linux.S 2015-09-26 06:46:20.103000200 -0400
387 -@@ -244,11 +244,11 @@
388 - ML_(blksys_finished): .quad 5b
389 - .previous
390 -
391 -+#endif // defined(VGP_amd64_linux)
392 -+
393 - /* Let the linker know we don't need an executable stack */
394 - .section .note.GNU-stack,"",@progbits
395 -
396 --#endif // defined(VGP_amd64_linux)
397 --
398 - /*--------------------------------------------------------------------*/
399 - /*--- end ---*/
400 - /*--------------------------------------------------------------------*/
401 -diff -Naur valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.11.0/coregrind/m_syswrap/syscall-x86-linux.S
402 ---- valgrind-3.11.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2015-09-08 09:23:26.000000000 -0400
403 -+++ valgrind-3.11.0/coregrind/m_syswrap/syscall-x86-linux.S 2015-09-26 06:46:20.103000200 -0400
404 -@@ -184,11 +184,11 @@
405 - ML_(blksys_finished): .long 5b
406 - .previous
407 -
408 -+#endif // defined(VGP_x86_linux)
409 -+
410 - /* Let the linker know we don't need an executable stack */
411 - .section .note.GNU-stack,"",@progbits
412 -
413 --#endif // defined(VGP_x86_linux)
414 --
415 - /*--------------------------------------------------------------------*/
416 - /*--- end ---*/
417 - /*--------------------------------------------------------------------*/
418
419 diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
420 deleted file mode 100644
421 index 68e68225561..00000000000
422 --- a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
423 +++ /dev/null
424 @@ -1,24 +0,0 @@
425 ---- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
426 -+++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
427 -@@ -81,8 +81,8 @@
428 - { UInt cia, r1, lr; \
429 - __asm__ __volatile__( \
430 - "mflr 0;" /* r0 = lr */ \
431 -- "bl m_libcassert_get_ip;" /* lr = pc */ \
432 -- "m_libcassert_get_ip:\n" \
433 -+ "bl 0f;" /* lr = pc */ \
434 -+ "0:\n" \
435 - "mflr %0;" /* %0 = pc */ \
436 - "mtlr 0;" /* restore lr */ \
437 - "mr %1,1;" /* %1 = r1 */ \
438 -@@ -100,8 +100,8 @@
439 - { ULong cia, r1, lr; \
440 - __asm__ __volatile__( \
441 - "mflr 0;" /* r0 = lr */ \
442 -- "bl .m_libcassert_get_ip;" /* lr = pc */ \
443 -- ".m_libcassert_get_ip:\n" \
444 -+ "bl 0f;" /* lr = pc */ \
445 -+ "0:\n" \
446 - "mflr %0;" /* %0 = pc */ \
447 - "mtlr 0;" /* restore lr */ \
448 - "mr %1,1;" /* %1 = r1 */ \
449
450 diff --git a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch b/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
451 deleted file mode 100644
452 index 79a3283c9c1..00000000000
453 --- a/dev-util/valgrind/files/valgrind-3.9.0-glibc-2.19.patch
454 +++ /dev/null
455 @@ -1,37 +0,0 @@
456 -diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
457 ---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000
458 -+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
459 -@@ -6689,6 +6689,16 @@
460 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
461 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
462 - ;;
463 -+ 2.19)
464 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
465 -+$as_echo "2.19 family" >&6; }
466 -+
467 -+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
468 -+
469 -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
470 -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
471 -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
472 -+ ;;
473 - darwin)
474 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
475 - $as_echo "Darwin" >&6; }
476 -diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
477 ---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000
478 -+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000
479 -@@ -918,6 +918,13 @@
480 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
481 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
482 - ;;
483 -+ 2.19)
484 -+ AC_MSG_RESULT(2.19 family)
485 -+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
486 -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
487 -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
488 -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
489 -+ ;;
490 - darwin)
491 - AC_MSG_RESULT(Darwin)
492 - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
Report Message
Find on MARC Find on Google Groups