Changeset 29271 in vbox for trunk/src

Timestamp:

May 9, 2010 9:25:16 PM (15 years ago)

Author:

vboxsync

Message:

Make VBoxRT build on sparc.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (4 diffs)
• common/log/logcom.cpp (modified) (3 diffs)
• generic/spinlock-generic.cpp (modified) (4 diffs)
• testcase/tstInlineAsm.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -990 +990 @@
 VBoxRT_SDKS                    = VBOX_OPENSSL VBOX_LIBXML2 VBOX_BOOST
 ifdef VBOX_WITH_LIBCURL
-VBoxRT_SDKS                   += VBOX_LIBCURL
+ VBoxRT_SDKS                  += VBOX_LIBCURL
 endif
 VBoxRT_SDKS.win                = WINPSDK W2K3DDK VBOX_NTDLL
@@ -997 +997 @@
 endif
 VBoxRT_DEFS                    = $(filter-out RT_NO_GIP,$(RuntimeR3_DEFS)) IN_SUP_R3 IN_SUP_R3
+ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+ VBoxRT_DEFS                  += RT_NO_GIP
+endif
 VBoxRT_DEFS.$(KBUILD_TYPE)     = $(RuntimeR3_DEFS.$(KBUILD_TYPE))
 VBoxRT_SOURCES                 = \
@@ -1034 +1037 @@
 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
 VBoxRT_LIBS                    = \
-        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
         $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
         $(SDK_VBOX_ZLIB_LIBS)
+if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+VBoxRT_LIBS                   += \
+        $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
+endif
 ifdef IPRT_WITH_KSTUFF
  VBoxRT_LIBS                  += \
         $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
 endif
-ifndef  SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBOX_LIBXML2_LIBS
  VBoxRT_LIBS                 += \
         $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
 endif
-ifndef  SDK_VBOX_OPENSSL_LIBS
+ifndef SDK_VBOX_OPENSSL_LIBS
  VBoxRT_LIBS                 += \
         $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)
@@ -1059 +1065 @@
 VBoxRT_LIBS.solaris            = \
         kstat
-ifn1of ($(KBUILD_TARGET_ARCH),sparc32 sparc64)
+ifn1of ($(KBUILD_TARGET_ARCH), sparc32 sparc64)
  # SMBIOS not available on Solaris SPARC.
  VBoxRT_LIBS.solaris += smbios

trunk/src/VBox/Runtime/common/log/logcom.cpp

@@ -49 +49 @@
 
 #include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) /** @todo consider fixing the config instead. */
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/stdarg.h>
 #include <iprt/string.h>
@@ -114 +116 @@
 RTDECL(void) RTLogWriteCom(const char *pach, size_t cb)
 {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     const uint8_t *pu8;
     for (pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
@@ -135 +138 @@
         ASMOutU8(IPRT_UART_BASE, *pu8);
     }
+#else
+    /* PORTME? */
+#endif
 }
 RT_EXPORT_SYMBOL(RTLogWriteCom);

trunk/src/VBox/Runtime/generic/spinlock-generic.cpp

@@ -43 +43 @@
 #include <iprt/alloc.h>
 #include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/err.h>
 #include <iprt/assert.h>
@@ -117 +119 @@
               ("pSpinlockInt=%p u32Magic=%08x\n", pSpinlockInt, pSpinlockInt ? (int)pSpinlockInt->u32Magic : 0));
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     pTmp->uFlags = ASMGetFlags();
+#else
+    pTmp->uFlags = 0;
+#endif
 #if RT_CFG_SPINLOCK_GENERIC_DO_SLEEP
     for (;;)
     {
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         ASMIntDisable();
+# endif
         for (int c = RT_CFG_SPINLOCK_GENERIC_DO_SLEEP; c > 0; c--)
             if (ASMAtomicCmpXchgU32(&pSpinlockInt->fLocked, 1, 0))
@@ -128 +136 @@
     }
 #else
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     ASMIntDisable();
+# endif
     while (!ASMAtomicCmpXchgU32(&pSpinlockInt->fLocked, 1, 0))
         /*nothing */;
@@ -145 +155 @@
     if (!ASMAtomicCmpXchgU32(&pSpinlockInt->fLocked, 0, 1))
         AssertMsgFailed(("Spinlock %p was not locked!\n", pSpinlockInt));
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     ASMSetFlags(pTmp->uFlags);
+#endif
 }
 RT_EXPORT_SYMBOL(RTSpinlockReleaseNoInts);

trunk/src/VBox/Runtime/testcase/tstInlineAsm.cpp

@@ -32 +32 @@
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
 # include <iprt/asm-amd64-x86.h>
+#else
+# include <iprt/time.h>
 #endif
 #include <iprt/stream.h>