diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-12-22 07:37:39 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-12-22 07:37:39 +0000 |
commit | 87de1281dfdec355f1521dc1ee179f09c01a89b8 (patch) | |
tree | e0cd6cd0f5bbf7f48735190bcf77060cd0c7bb64 /app-emulation/wine/files | |
parent | bumped to rc4 (diff) | |
download | historical-87de1281dfdec355f1521dc1ee179f09c01a89b8.tar.gz historical-87de1281dfdec355f1521dc1ee179f09c01a89b8.tar.bz2 historical-87de1281dfdec355f1521dc1ee179f09c01a89b8.zip |
Fix building with newer valgrinds #202542.
Package-Manager: portage-2.1.4_rc10
Diffstat (limited to 'app-emulation/wine/files')
-rw-r--r-- | app-emulation/wine/files/wine-0.9.51-valgrind.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/app-emulation/wine/files/wine-0.9.51-valgrind.patch b/app-emulation/wine/files/wine-0.9.51-valgrind.patch new file mode 100644 index 000000000000..acd0bb11dcf9 --- /dev/null +++ b/app-emulation/wine/files/wine-0.9.51-valgrind.patch @@ -0,0 +1,56 @@ +http://bugs.gentoo.org/202542 + +fix from Rafal Muzylo building with newer versions of valgrind + +--- dlls/ntdll/heap.c ++++ dlls/ntdll/heap.c +@@ -142,6 +142,8 @@ + if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); + #ifdef VALGRIND_MAKE_NOACCESS + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); ++#elif defined(VALGRIND_MAKE_MEM_NOACCESS) ++ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); + #endif + } + +@@ -150,6 +152,8 @@ + { + #ifdef VALGRIND_MAKE_READABLE + VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); ++#elif defined(VALGRIND_MAKE_MEM_DEFINED) ++ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); + #endif + } + +@@ -158,6 +162,8 @@ + { + #ifdef VALGRIND_MAKE_WRITABLE + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); ++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) ++ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); + #endif + if (TRACE_ON(heap) || WARN_ON(heap)) + { +@@ -165,6 +171,8 @@ + #ifdef VALGRIND_MAKE_WRITABLE + /* make it uninitialized to valgrind again */ + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); ++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) ++ VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); + #endif + } + } +--- dlls/ntdll/signal_i386.c ++++ dlls/ntdll/signal_i386.c +@@ -936,8 +936,10 @@ + } + + stack--; /* push the stack_layout structure */ +-#ifdef HAVE_VALGRIND_MEMCHECK_H ++#ifdef VALGRIND_MAKE_WRITABLE + VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); ++#elif defined(VALGRIND_MAKE_MEM_UNDEFINED) ++ VALGRIND_MAKE_MEM_UNDEFINED(stack, sizeof(*stack)); + #endif + stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ + stack->rec_ptr = &stack->rec; |