Changeset 98511 in vbox

Timestamp:

Feb 8, 2023 9:31:43 PM (2 years ago)

Author:

vboxsync

Message:

IPRT,/Config.kmk,Add/*.kmk: Drop int64.lib, use our own implementation from IPRT. bugref:10261

Location:

trunk

Files:

• Config.kmk (modified) (8 diffs)
• src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk (modified) (4 diffs)
• src/VBox/Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -5078 +5078 @@
 
 #
-# SDK for including int64.lib for x86 targets.
-# It conceptually moved from the WDK to the PSDK with W10, as it's now in the um subdir.
-#
-SDK_VBoxWinInt64Lib             := Abstracts where to find int64.lib for x86 builds.
-ifn1of ($(VBOX_WINPSDK), WINPSDK71 WINPSDK80)
- SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/int64.lib
- ifeq ($(KBUILD_TARGET),win)
-  include $(KBUILD_PATH)/sdks/$(VBOX_WINPSDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
- endif
-else
- SDK_VBoxWinInt64Lib_LIBS.x86    = $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
- ifeq ($(KBUILD_TARGET),win)
-  include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
- endif
-endif
-
-#
 # Determine Solaris version.
 #
@@ -5215 +5198 @@
    TEMPLATE_VBoxRc_LDFLAGS          += -IntegrityCheck
   endif
-  TEMPLATE_VBoxRc_SDKS.x86          += VBoxWinInt64Lib
   TEMPLATE_VBoxRc_LIBS              += \
         $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
@@ -5386 +5368 @@
   include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
  endif
- TEMPLATE_VBoxR0_SDKS.x86          += VBoxWinInt64Lib
  TEMPLATE_VBoxR0_ORDERDEPS          = $(VBOX_SIGN_DRIVER_ORDERDEPS)
  TEMPLATE_VBoxR0_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
@@ -6432 +6413 @@
   ifdef VBOX_WITH_NOCRT_STATIC
    TEMPLATE_VBoxR3StaticBase_SDKS          = $(subst WINSDK10-UCRT,,$(TEMPLATE_VBoxR3Exe_SDKS))
-   TEMPLATE_VBoxR3StaticBase_SDKS.x86      = $(TEMPLATE_VBoxR3Exe_SDKS.x86) VBoxWinInt64Lib  ## @todo drop this asap. @bugref{10261}
   else
    TEMPLATE_VBoxR3StaticBase_SDKS          = $(subst WINSDK10-UCRT, WINSDK10-UCRT-STATIC,$(TEMPLATE_VBoxR3Exe_SDKS))
@@ -6688 +6668 @@
         $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
  endif
- TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86  += VBoxWinInt64Lib
  TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS        = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
  TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
@@ -6731 +6710 @@
 ifeq ($(KBUILD_TARGET),win) # No CRT!
  TEMPLATE_VBoxR3HardenedExe_SDKS          = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS)
- TEMPLATE_VBoxR3HardenedExe_SDKS.x86      = VBoxWinInt64Lib
  ifneq ($(VBOX_VCC_LD_GUARD_CF),)
   TEMPLATE_VBoxR3HardenedExe_CXXFLAGS       = $(filter-out -RTC% -GZ $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Exe_CXXFLAGS))
@@ -8586 +8564 @@
  TEMPLATE_VBoxGuestR3NoCrtExe_LIBS.win.x86   = \
         $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
- TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86   = VBoxWinInt64Lib
  TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS        = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
  TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
@@ -8674 +8651 @@
 TEMPLATE_VBoxGuestR0Drv_EXTENDS     = VBoxR0Drv
 TEMPLATE_VBoxGuestR0Drv_INST        = $(INST_ADDITIONS)
-TEMPLATE_VBoxGuestR0Drv_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS) VBoxWinInt64Lib
+TEMPLATE_VBoxGuestR0Drv_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
 TEMPLATE_VBoxGuestR0Drv_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST_INCS)
 TEMPLATE_VBoxGuestR0Drv_DEFS        = $(TEMPLATE_VBoxR0Drv_DEFS) IN_GUEST IN_GUEST_R0

trunk/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk

@@ -46 +46 @@
         $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
         $(VBOX_LIB_VBGL_R0) \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/int64.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk

@@ -61 +61 @@
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/copysup.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/hal.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ksecdd.lib
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ksecdd.lib \
+        $(VBOX_LIB_VBGL_R0) \
+        $(VBOX_LIB_IPRT_GUEST_R0) # before ntoskrnl.lib
 ifneq ($(VBOX_VCC_CC_GUARD_CF),)
  VBoxSF_LIBS += \
@@ -71 +73 @@
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib
 endif
-VBoxSF_LIBS += \
-        $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0)
 
 VBoxSF_CLEAN = \
@@ -86 +85 @@
  #
  # This driver version is used for Windows 2000, XP, W2K3, Vista and 7.
- # Note! Including int64.lib here for _aulldvrm which isn't exported by w2k.
  #
  SYSMODS += VBoxSFW2K
@@ -99 +97 @@
         \
         $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0) \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB)/int64.lib
+        $(VBOX_LIB_IPRT_GUEST_R0) # before ntoskrnl.lib
  ifneq ($(VBOX_VCC_CC_GUARD_CF),)
   VBoxSFW2K_LIBS += \

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -98 +98 @@
         $(VBOX_LIB_IPRT_GUEST_R0) \
         $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/int64.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2147 +2147 @@
         common/compiler/vcc/x86-aulldiv.asm \
         common/compiler/vcc/x86-aullrem.asm \
-        common/compiler/vcc/x86-aulldvrm.asm \
-        common/compiler/vcc/RTVccUInt64Div.cpp
+        common/compiler/vcc/x86-aulldvrm.asm
   RuntimeR3_VBOX_NOCRT_ALIASES.win := \
         strtok_s=nocrt_strtok_r _strtok_s=nocrt_strtok_r nocrt_strtok_s=nocrt_strtok_r \
@@ -4157 +4156 @@
 #
 # RuntimeGuestR0 - Guest driver runtime.
-#                  This is almost the same as the RuntimeR0Drv, the main difference
-#                  is in the backdoor logging and the lack of sup.h (which should be
-#                  made irrelevant even for RuntimeR0Drv).
+#
+#   This is almost the same as the RuntimeR0Drv, the main difference is in the
+#   backdoor logging and the lack of sup.h (which should be made irrelevant even
+#   for RuntimeR0Drv).
+#
+#   In addition we include 64-bit integer stuff, since older kernels doesn't
+#   export all of these and we happen to have all of it.
 #
 RuntimeGuestR0_TEMPLATE  := VBoxGuestR0DrvLib
@@ -4169 +4172 @@
 RuntimeGuestR0_SOURCES.win := \
         $(filter-out common/checksum/md% common/checksum/sha%, $(RuntimeR0Drv_SOURCES.win))
+RuntimeGuestR0_SOURCES.win.x86 := \
+        $(RuntimeR0Drv_SOURCES.win.x86) \
+        common/compiler/vcc/x86-allshl.asm \
+        common/compiler/vcc/x86-allshr.asm \
+        common/compiler/vcc/x86-aullshr.asm \
+        common/compiler/vcc/x86-allmul.asm \
+        common/compiler/vcc/x86-alldiv.asm \
+        common/compiler/vcc/x86-allrem.asm \
+        common/compiler/vcc/x86-alldvrm.asm \
+        common/compiler/vcc/x86-aulldiv.asm \
+        common/compiler/vcc/x86-aullrem.asm \
+        common/compiler/vcc/x86-aulldvrm.asm
+