From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 13 Feb 2015 16:26:44 +0000 (+0000)
Subject: Use LibVEX_GUEST_STATE_ALIGN introduced in VEX r3091.
X-Git-Tag: svn/VALGRIND_3_11_0~662
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=493dd569d2573602b0ca7a500fcaa79c306ddd53;p=thirdparty%2Fvalgrind.git

Use LibVEX_GUEST_STATE_ALIGN introduced in VEX r3091.


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

diff --git a/coregrind/m_threadstate.c b/coregrind/m_threadstate.c
index c20000288d..c53e406b0b 100644
--- a/coregrind/m_threadstate.c
+++ b/coregrind/m_threadstate.c
@@ -44,7 +44,8 @@
 
 ThreadId VG_(running_tid) = VG_INVALID_THREADID;
 
-ThreadState VG_(threads)[VG_N_THREADS] __attribute__((aligned(16)));
+ThreadState VG_(threads)[VG_N_THREADS]
+            __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
 /*------------------------------------------------------------*/
 /*--- Operations.                                          ---*/
diff --git a/coregrind/pub_core_threadstate.h b/coregrind/pub_core_threadstate.h
index 2f322597db..58d42f78a1 100644
--- a/coregrind/pub_core_threadstate.h
+++ b/coregrind/pub_core_threadstate.h
@@ -97,14 +97,17 @@ typedef
          scheduler.c. */
 
       /* Saved machine context. */
-      VexGuestArchState vex __attribute__((aligned(16)));
+      VexGuestArchState vex __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* Saved shadow context (2 copies). */
-      VexGuestArchState vex_shadow1 __attribute__((aligned(16)));
-      VexGuestArchState vex_shadow2 __attribute__((aligned(16)));
+      VexGuestArchState vex_shadow1
+                        __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
+      VexGuestArchState vex_shadow2 
+                        __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* Spill area. */
-      UChar vex_spill[LibVEX_N_SPILL_BYTES] __attribute__((aligned(16)));
+      UChar vex_spill[LibVEX_N_SPILL_BYTES]
+            __attribute__((aligned(LibVEX_GUEST_STATE_ALIGN)));
 
       /* --- END vex-mandated guest state --- */
    }