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 c20000288d9fc380804b5b3bdd510ca75705a967..c53e406b0b33bab223e9086e80aa44dad2f62c44 100644 (file)
--- 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 2f322597db19be46fb79512e738a7ab0431bff6b..58d42f78a104bb4d4176de51d73ca691b99a06b0 100644 (file)
--- 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 --- */
    }