Ticket #1: recompiler.diff

\src\recompiler/bswap.h

@@ -5 +5 @@
 
 #include <inttypes.h>
 
+#undef bswap16
+#undef bswap32
+#undef bswap64
+
 #ifdef CONFIG_MACHINE_BSWAP_H
 #include <sys/endian.h>
 #include <sys/types.h>

\src\recompiler/Makefile.kmk

@@ -185 +185 @@
  # VBoxREM32/VBoxRemPrimary
  #
  DLLS += VBoxRemPrimary
+ifneq ($(KBUILD_TARGET),os2)
  VBoxRemPrimary_NAME       = VBoxREM32
+else
+ VBoxRemPrimary_NAME       = VBoxRM32
+endif
  VBoxRemPrimary_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM32.dylib
  VBOX_REM_WRAPPER          = 32
 
@@ -195 +199 @@
  DLLS += VBoxREM64
  VBoxREM64_EXTENDS         = VBoxRemPrimary
  VBoxREM64_EXTENDS_BY      = appending
+ifneq ($(KBUILD_TARGET),os2)
  VBoxREM64_NAME            = VBoxREM64
+else
+ VBoxREM64_NAME            = VBoxRM64
+endif
  VBoxREM64_DEFS            = VBOX_ENABLE_VBOXREM64
  VBoxREM64_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxREM64.dylib
 

\src\recompiler/VBoxRecompiler.c

@@ -433 +433 @@
     STAM_REG(pVM, &pVM->rem.s.Env.StatTbFlush,      STAMTYPE_PROFILE,   "/REM/TbFlush",     STAMUNIT_TICKS_PER_CALL, "profiling tb_flush().");
 #endif /* VBOX_WITH_STATISTICS */
     AssertCompileMemberAlignment(CPUX86State, StatTbFlush, 4);
+#if !defined(RT_OS_OS2)
     AssertCompileMemberAlignment(CPUX86State, StatTbFlush, 8);
-
+#endif
+    
     STAM_REL_REG(pVM, &tb_flush_count,              STAMTYPE_U32_RESET, "/REM/TbFlushCount",                STAMUNIT_OCCURENCES, "tb_flush() calls");
     STAM_REL_REG(pVM, &tb_phys_invalidate_count,    STAMTYPE_U32_RESET, "/REM/TbPhysInvldCount",            STAMUNIT_OCCURENCES, "tb_phys_invalidate() calls");
     STAM_REL_REG(pVM, &tlb_flush_count,             STAMTYPE_U32_RESET, "/REM/TlbFlushCount",               STAMUNIT_OCCURENCES, "tlb_flush() calls");

\src\recompiler/VBoxREMWrapper.cpp

@@ -2168 +2168 @@
     /*
      * Load the VBoxREM32/64 object/DLL.
      */
+#ifndef RT_OS_OS2
     const char *pszModule = remIs64bitEnabled(pVM) ? "VBoxREM64" : "VBoxREM32";
+#else
+    const char *pszModule = remIs64bitEnabled(pVM) ? "VBoxRM64" : "VBoxRM32";
+#endif
     int rc = SUPR3HardenedLdrLoadAppPriv(pszModule, &g_ModREM2, RTLDRLOAD_FLAGS_LOCAL, NULL);
     if (RT_SUCCESS(rc))
     {