| 1 |
vapier 07/12/22 07:37:40 |
| 2 |
|
| 3 |
Added: wine-0.9.51-valgrind.patch |
| 4 |
Log: |
| 5 |
Fix building with newer valgrinds #202542. |
| 6 |
(Portage version: 2.1.4_rc10) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-emulation/wine/files/wine-0.9.51-valgrind.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/files/wine-0.9.51-valgrind.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/files/wine-0.9.51-valgrind.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: wine-0.9.51-valgrind.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/202542 |
| 17 |
|
| 18 |
fix from Rafal Muzylo building with newer versions of valgrind |
| 19 |
|
| 20 |
--- dlls/ntdll/heap.c |
| 21 |
+++ dlls/ntdll/heap.c |
| 22 |
@@ -142,6 +142,8 @@ |
| 23 |
if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); |
| 24 |
#ifdef VALGRIND_MAKE_NOACCESS |
| 25 |
VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); |
| 26 |
+#elif defined(VALGRIND_MAKE_MEM_NOACCESS) |
| 27 |
+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); |
| 28 |
#endif |
| 29 |
} |
| 30 |
|
| 31 |
@@ -150,6 +152,8 @@ |
| 32 |
{ |
| 33 |
#ifdef VALGRIND_MAKE_READABLE |
| 34 |
VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); |
| 35 |
+#elif defined(VALGRIND_MAKE_MEM_DEFINED) |
| 36 |
+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); |
| 37 |
#endif |
| 38 |
} |
| 39 |
|
| 40 |
@@ -158,6 +162,8 @@ |
| 41 |
{ |
| 42 |
#ifdef VALGRIND_MAKE_WRITABLE |
| 43 |
VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); |
| 44 |
+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) |
| 45 |
+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); |
| 46 |
#endif |
| 47 |
if (TRACE_ON(heap) || WARN_ON(heap)) |
| 48 |
{ |
| 49 |
@@ -165,6 +171,8 @@ |
| 50 |
#ifdef VALGRIND_MAKE_WRITABLE |
| 51 |
/* make it uninitialized to valgrind again */ |
| 52 |
VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); |
| 53 |
+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) |
| 54 |
+ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); |
| 55 |
#endif |
| 56 |
} |
| 57 |
} |
| 58 |
--- dlls/ntdll/signal_i386.c |
| 59 |
+++ dlls/ntdll/signal_i386.c |
| 60 |
@@ -936,8 +936,10 @@ |
| 61 |
} |
| 62 |
|
| 63 |
stack--; /* push the stack_layout structure */ |
| 64 |
-#ifdef HAVE_VALGRIND_MEMCHECK_H |
| 65 |
+#ifdef VALGRIND_MAKE_WRITABLE |
| 66 |
VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); |
| 67 |
+#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) |
| 68 |
+ VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); |
| 69 |
#endif |
| 70 |
stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ |
| 71 |
stack->rec_ptr = &stack->rec; |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
-- |
| 76 |
gentoo-commits@g.o mailing list |
Archives