Changeset 26523 in vbox

Timestamp:

Feb 15, 2010 2:18:13 AM (15 years ago)

Author:

vboxsync

Message:

VBoxRc,VBoxR0: Added RuntimeR?Stub libraries for the stub entrypoint that's required to shut up the microsoft linker.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (4 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2169 +2169 @@
   endif
   TEMPLATE_VBoxRc_LIBS               = \
-        $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
+        $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \
+        $(PATH_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
   TEMPLATE_VBoxRc_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
  endif # pe
@@ -2287 +2288 @@
 TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
 TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_WERR)
+TEMPLATE_VBoxR0_LIBS                = \
+        $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
 TEMPLATE_VBoxR0_LIBS.x86            = \
         $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib

trunk/src/VBox/Devices/Makefile.kmk

@@ -616 +616 @@
  endif
 
- ifeq ($(VBOX_LDR_FMT32),pe)
- VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
- endif
  if1of ($(VBOX_LDR_FMT32), pe lx)
  VBoxDDGC_LIBS           = \
@@ -717 +714 @@
 endif
 
-ifeq ($(VBOX_LDR_FMT32),pe)
-VBoxDDR0_LDFLAGS        = -Entry:vgaMMIOWrite
-endif
 if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
@@ -736 +730 @@
  VBoxDD2GC_SOURCES        = \
         PC/DevAPIC.cpp
- ifeq ($(VBOX_LDR_FMT32),pe)
- VBoxDD2GC_LDFLAGS        = -Entry:apicMMIOWrite
- endif
  if1of ($(VBOX_LDR_FMT32), pe lx)
  VBoxDD2GC_LIBS           = \
@@ -756 +747 @@
 VBoxDD2R0_SOURCES        = \
         PC/DevAPIC.cpp
-ifeq ($(VBOX_LDR_FMT),pe)
-VBoxDD2R0_LDFLAGS        = -Entry:apicMMIOWrite
-endif
 if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDD2R0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -58 +58 @@
 
  BLDPROGS += uniread
- LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
+ LIBRARIES += RuntimeR3 RuntimeR0 RuntimeR0Stub RuntimeEFCPP RuntimeR3NoCRTGCC
  ifdef VBOX_WITH_RAW_MODE
-  LIBRARIES += RuntimeRC
+  LIBRARIES += RuntimeRC RuntimeRCStub
  endif
  ifdef VBOX_WITH_VBOXDRV
@@ -1109 +1109 @@
 
 #
-# RuntimeR0 - Ring0 library for VMMR0.
+# RuntimeR0 - Ring-0 library for VMMR0.
 #
 RuntimeR0_TEMPLATE      = VBoxR0
@@ -1202 +1202 @@
 
 #
-# RuntimeR0Drv - Ring0 library for host drivers.
+# RuntimeR0Stub - Ring-0 context startup stub for Windows.
+#
+RuntimeR0Stub_TEMPLATE    = VBoxR0
+RuntimeR0Stub_SOURCES.win = \
+        nt/NtProcessStartup-stub.cpp
+
+
+#
+# RuntimeR0Drv - Ring-0 library for host drivers.
 #
 RuntimeR0Drv_TEMPLATE   = VBOXR0DRV
@@ -1639 +1647 @@
         common/math/gcc/xordi3.c
  endif
+
+
+ #
+ # RuntimeRCStub - Raw-mode context startup stub for Windows.
+ #
+ RuntimeRCStub_TEMPLATE    = VBoxRc
+ RuntimeRCStub_SOURCES.win = \
+        nt/NtProcessStartup-stub.cpp
+
+
 endif # VBOX_WITH_RAW_MODE
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -364 +364 @@
  endif
 
- ifeq ($(VBOX_LDR_FMT32),pe)
-  VMMGC_LDFLAGS  = -Entry:VMMGCEntry
- endif
-
  VMMGC_SOURCES   = \
         VMMGC/VMMGC0.asm \
@@ -466 +462 @@
 VMMR0_DEFS.win.amd64  = VBOX_WITH_KERNEL_USING_XMM
 
-ifeq ($(VBOX_LDR_FMT),pe)
- VMMR0_LDFLAGS  = -Entry:VMMR0EntryEx
-endif
 ifeq ($(VBOX_LDR_FMT),elf)
  VMMR0_LDFLAGS  = -e VMMR0EntryEx