From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 22 Oct 2011 23:18:00 +0000 (+0000)
Subject: Fix the guest state definition for s390x and introduce dummy members
X-Git-Tag: svn/VALGRIND_3_7_0^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d1d5b0937195036f9231dbb7a5147a6337dba8f;p=thirdparty%2Fvalgrind.git

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 69ec782b59..3bbeaf2b37 100644
--- 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;
 
 /*------------------------------------------------------------*/