From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Thu, 3 Oct 2013 22:36:54 +0000 (+0000)
Subject: Fix compilation problem of memcheck/tests/leak-segv-jmp on ppc32
X-Git-Tag: svn/VALGRIND_3_9_0~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb236bf83a3c3c020c452eb89ffe43f3641365f;p=thirdparty%2Fvalgrind.git

Fix compilation problem of memcheck/tests/leak-segv-jmp on ppc32
With the change, the test compiles on ppc32.
However, the test fails miserably with
 Segmentation fault
while the whole purpose of the test was to see the leak search
would *not* segfault.

More investigations needed, but still committing as is to let
the tests compile and run.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13612
---

diff --git a/memcheck/tests/leak-segv-jmp.c b/memcheck/tests/leak-segv-jmp.c
index 76c04941e7..372d4503dd 100644
--- a/memcheck/tests/leak-segv-jmp.c
+++ b/memcheck/tests/leak-segv-jmp.c
@@ -7,14 +7,15 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-typedef unsigned long          UWord;
+typedef unsigned long            UWord;
+typedef unsigned long long int   ULong;
+// Below code is copied from m_syscall.c
+// Refer to this file for syscall convention.
+#if defined(VGP_x86_linux)
 extern UWord do_syscall_WRK (UWord syscall_no, 
                              UWord a1, UWord a2, UWord a3,
                              UWord a4, UWord a5, UWord a6
                              );
-// Below code is copied from m_syscall.c
-// Refer to this file for syscall convention.
-#if defined(VGP_x86_linux)
 asm(
 ".text\n"
 ".globl do_syscall_WRK\n"
@@ -104,7 +105,6 @@ asm(
 ".previous\n"
 );
 #elif defined(VGP_s390x_linux)
-typedef  unsigned long long int   ULong;
 UWord do_syscall_WRK (
    UWord syscall_no,
    UWord arg1, UWord arg2, UWord arg3,