Changeset 9556 in vbox

Timestamp:

Jun 9, 2008 6:19:10 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

31842

Message:

Made it possible to select the mp code on solaris in non-vbi mode.

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1119 +1119 @@
 ifdef VBOX_WITH_SOLARIS_VBI
  RuntimeR0Drv_SOURCES.solaris += \
-        r0drv/solaris/vbi/mp-r0drv-solaris.c \
         r0drv/solaris/vbi/alloc-r0drv-solaris.c \
         r0drv/solaris/vbi/assert-r0drv-solaris.c \
         r0drv/solaris/vbi/initterm-r0drv-solaris.c \
         r0drv/solaris/vbi/memobj-r0drv-solaris.c \
+        r0drv/solaris/vbi/mp-r0drv-solaris.c \
         r0drv/solaris/vbi/process-r0drv-solaris.c \
         r0drv/solaris/vbi/RTLogWriteDebugger-r0drv-solaris.c \
@@ -1134 +1134 @@
         r0drv/solaris/vbi/time-r0drv-solaris.c \
         r0drv/solaris/vbi/timer-r0drv-solaris.c
+$(error )
 else  # !VBOX_WITH_SOLARIS_VBI
  RuntimeR0Drv_SOURCES.solaris += \
-        generic/RTMpCpuId-generic.cpp \
-        generic/RTMpCpuIdFromSetIndex-generic.cpp \
-        generic/RTMpCpuIdToSetIndex-generic.cpp \
-        generic/RTMpIsCpuPossible-generic.cpp \
-        generic/RTMpGetCount-generic.cpp \
-        generic/RTMpGetMaxCpuId-generic.cpp \
-        generic/RTMpGetOnlineCount-generic.cpp \
-        generic/RTMpGetOnlineSet-generic.cpp \
-        generic/RTMpGetSet-generic.cpp \
-        generic/RTMpIsCpuOnline-generic.cpp \
-        r0drv/generic/RTMpOn-r0drv-generic.cpp \
         r0drv/solaris/alloc-r0drv-solaris.c \
         r0drv/solaris/assert-r0drv-solaris.c \
@@ -1161 +1151 @@
         r0drv/solaris/time-r0drv-solaris.c \
         r0drv/solaris/timer-r0drv-solaris.c
+ # Don't use mp-r0drv-solaris.c because it will cause crashes due to incorrect memobj-r0drv-solaris.c code.
+ ifeq (0,0)
+  # Stub it. ## @todo limit the stubbing to RTMpOn*.
+  RuntimeR0Drv_SOURCES.solaris += \
+        generic/RTMpCpuId-generic.cpp \
+        generic/RTMpCpuIdFromSetIndex-generic.cpp \
+        generic/RTMpCpuIdToSetIndex-generic.cpp \
+        generic/RTMpIsCpuPossible-generic.cpp \
+        generic/RTMpGetCount-generic.cpp \
+        generic/RTMpGetMaxCpuId-generic.cpp \
+        generic/RTMpGetOnlineCount-generic.cpp \
+        generic/RTMpGetOnlineSet-generic.cpp \
+        generic/RTMpGetSet-generic.cpp \
+        generic/RTMpIsCpuOnline-generic.cpp \
+        r0drv/generic/RTMpOn-r0drv-generic.cpp
+ else
+  # Use mp-r0drv-solaris.c.
+  RuntimeR0Drv_SOURCES.solaris += \
+        r0drv/solaris/mp-r0drv-solaris.c
+#       r0drv/solaris/mpnotification-r0drv-solaris.c
+ endif
+
 endif # !VBOX_WITH_SOLARIS_VBI