Fix the guest state definition for s390x and introduce dummy members

in places where 8-byte alignment is needed.

We need to make sure that libvex_guest_offsets.h contains correct
offsets even when genoffsets.c is compiled for a 32-bit target.

With this change a tarball built on x86 will result in a working
valgrind on s390x.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2224

diff --git a/VEX/pub/libvex_guest_s390x.h b/VEX/pub/libvex_guest_s390x.h
index 69ec782b5972b08c24a13494ae3340c50d08dade..3bbeaf2b37d0534f81c693f2e9f19fedd1161cb3 100644 (file)
--- a/VEX/pub/libvex_guest_s390x.h
+++ b/VEX/pub/libvex_guest_s390x.h
@@ -109,7 +109,7 @@ typedef struct {
 
    /*  320 */  ULong guest_counter;
    /*  328 */  UInt guest_fpc;
-   /* 4-byte hole to enforce alignment requirements */
+   /*  332 */  UChar unused[4]; /* 4-byte hole to get 8-byte alignment */
    /*  336 */  ULong guest_IA;
 
 /*------------------------------------------------------------*/