Changeset 1485 in vbox for trunk

Timestamp:

Mar 14, 2007 6:50:17 PM (18 years ago)

Author:

vboxsync

Message:

More build fixes.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/SELM.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -319 +319 @@
 
     /* padding to make gnuc put the StatQemuToGC where msc does. */
-/*#if HC_ARCH_BITS == 32
-    uint32_t            padding0;
-#endif*/
+#if HC_ARCH_BITS == 32
+    uint32_t            padding0[2];
+#endif
 
     /** Profiling the total time from Qemu to GC. */

trunk/src/VBox/VMM/SELM.cpp

@@ -102 +102 @@
     AssertCompile(sizeof(pVM->selm.s) <= sizeof(pVM->selm.padding));    AssertRelease(sizeof(pVM->selm.s) <= sizeof(pVM->selm.padding));
     AssertCompileMemberAlignment(VM, selm.s, 32);                       AssertRelease(!(RT_OFFSETOF(VM, selm.s) & 31));
-#ifndef __AMD64__ /* gcc 4.1.1 doesn't deal correctly with this :/ */
+#if 0 /* doesn't work */
     AssertCompile((RT_OFFSETOF(VM, selm.s.Tss)       & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.Tss));       
     AssertCompile((RT_OFFSETOF(VM, selm.s.TssTrap08) & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(pVM->selm.s.TssTrap08));