Changeset 29263 in vbox for trunk/src

Timestamp:

May 9, 2010 7:52:03 PM (15 years ago)

Author:

vboxsync

Message:

sparc adjustments.

Location:

trunk/src

Files:

• Makefile.kmk (modified) (1 diff)
• VBox/Makefile.kmk (modified) (2 diffs)
• VBox/Runtime/common/log/log.cpp (modified) (1 diff)
• VBox/Runtime/r3/posix/fileio-posix.cpp (modified) (1 diff)

trunk/src/Makefile.kmk

@@ -37 +37 @@
  include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
+ if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
+  include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
+ endif
  ifneq ($(wildcard $(PATH_SUB_CURRENT)/apps),)
   include $(PATH_SUB_CURRENT)/apps/Makefile.kmk

trunk/src/VBox/Makefile.kmk

@@ -53 +53 @@
  endif
  include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
- include $(PATH_SUB_CURRENT)/HostServices/Makefile.kmk
+ if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+  include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
+  include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
+  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
+  include $(PATH_SUB_CURRENT)/HostServices/Makefile.kmk
+ endif
  ifdef VBOX_WITH_DEBUGGER
   include $(PATH_SUB_CURRENT)/Debugger/Makefile.kmk
@@ -71 +73 @@
   include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk
  endif
- include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
+ if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
+  include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
+ endif
  ifdef VBOX_WITH_INSTALLER
   include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk                    # Keep this last.

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

@@ -2368 +2368 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_TSC)
                 {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
                     uint64_t     u64    = ASMReadTSC();
+#else
+                    uint64_t     u64    = RTTimeNanoTS();
+#endif
                     int          iBase  = 16;
                     unsigned int fFlags = RTSTR_F_ZEROPAD;

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -271 +271 @@
         }
 #endif /* 0 && RT_OS_LINUX */
-#ifdef DEBUG_bird
+#if defined(DEBUG_bird) && !defined(RT_OS_SOLARIS)
         if (iErr == 0)
         {