Index: /trunk/include/VBox/vmm/cpum.mac
===================================================================
--- /trunk/include/VBox/vmm/cpum.mac	(revision 65908)
+++ /trunk/include/VBox/vmm/cpum.mac	(revision 65909)
@@ -253,5 +253,9 @@
     .pXStateRC      RTRCPTR_RES 1
     .aoffXState         resw    64
-    alignb 8
+%if HC_ARCH_BITS == 64
+    .abPadding          resb    4
+%else
+    .abPadding          resb    12
+%endif
     .hwvirt.svm.uMsrHSavePa         resq    1
     .hwvirt.svm.u64InterceptCtrl    resq    1
Index: /trunk/include/VBox/vmm/cpumctx.h
===================================================================
--- /trunk/include/VBox/vmm/cpumctx.h	(revision 65908)
+++ /trunk/include/VBox/vmm/cpumctx.h	(revision 65909)
@@ -431,11 +431,6 @@
     uint16_t                    aoffXState[64];
 
-#if HC_ARCH_BITS == 64
     /** 724 - Size padding. */
-    uint32_t                    u32Padding;
-#else
-    /** 716 - Size padding. */
-    uint8_t                     auPadding[12];
-#endif
+    uint8_t                     abPadding[HC_ARCH_BITS == 64 ? 4 : 12];
 
     /** 728 - Hardware virtualization state.   */
Index: /trunk/src/VBox/VMM/include/CPUMInternal.mac
===================================================================
--- /trunk/src/VBox/VMM/include/CPUMInternal.mac	(revision 65908)
+++ /trunk/src/VBox/VMM/include/CPUMInternal.mac	(revision 65909)
@@ -226,5 +226,9 @@
     .Guest.pXStateRC      RTRCPTR_RES 1
     .Guest.aoffXState         resw    64
-    alignb 8
+%if HC_ARCH_BITS == 64
+    .Guest.abPadding          resb    4
+%else
+    .Guest.abPadding          resb    12
+%endif
     .Guest.hwvirt.svm.uMsrHSavePa         resq    1
     .Guest.hwvirt.svm.u64InterceptCtrl    resq    1
@@ -493,5 +497,9 @@
     .Hyper.pXStateRC      RTRCPTR_RES 1
     .Hyper.aoffXState         resw    64
-    alignb 8
+%if HC_ARCH_BITS == 64
+    .Hyper.abPadding          resb    4
+%else
+    .Hyper.abPadding          resb    12
+%endif
     .Hyper.hwvirt.svm.uMsrHSavePa         resq    1
     .Hyper.hwvirt.svm.u64InterceptCtrl    resq    1