Changeset 91768 in vbox

Timestamp:

Oct 15, 2021 7:24:23 PM (3 years ago)

Author:

vboxsync

Message:

Config.kmk,++: Define VBOX_LIB_SUPR0 for SUPR0.lib/.a on platforms where it's needed and skip all the if'ing. bugref:10124

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/testcase/Makefile.kmk (modified) (7 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/ValidationKit/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1997 +1997 @@
  VBOX_LIB_XPCOM_X86     = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.dylib
  LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.dylib
+ VBOX_LIB_SUPR0 :=
 endif
 if1of ($(KBUILD_TARGET), freebsd haiku linux netbsd openbsd solaris)
@@ -2010 +2011 @@
  VBOX_LIB_XPCOM_X86   = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.so
  LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.so
+ VBOX_LIB_SUPR0 :=
 endif
 ifeq ($(KBUILD_TARGET),os2)
@@ -2024 +2026 @@
  LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.dll
  VBOX_OBJ_SYS0   = $(PATH_OBJ)/RuntimeR0/os2/sys0.obj
+ VBOX_LIB_SUPR0  = $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 ifeq ($(KBUILD_TARGET),win)
@@ -2037 +2040 @@
  VBOX_LIB_XPCOM_X86 =
  LIB_DDU         = $(PATH_STAGE_LIB)/VBoxDDU.lib
+ VBOX_LIB_SUPR0  = $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.amd64 linux.amd64)
@@ -6969 +6973 @@
  if1of ($(VBOX_LDR_FMT), pe lx)
   TEMPLATE_VBoxR0ExtPack_LIBS = \
-        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
- endif
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
+ endif
+ TEMPLATE_VBoxR0ExtPack_LIBS += \
+        $(VBOX_LIB_SUPR0)
 
  TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.

trunk/src/VBox/Devices/Makefile.kmk

@@ -1391 +1391 @@
  if1of ($(VBOX_LDR_FMT), pe lx)
  VBoxDDR0_LIBS           = \
-        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
- endif
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
+ endif
+ VBoxDDR0_LIBS          += \
+        $(VBOX_LIB_SUPR0)
 
  $(call VBOX_SET_VER_INFO_R0,VBoxDDR0,VirtualBox VMM Devices and Drivers$(COMMA) ring-0) # (last!)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -268 +268 @@
         $(VBOXDT_PATH_UTS)/common/dtrace/dtrace.c
  VBoxDTraceR0_LIBS = \
-        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
- ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
-  VBoxDTraceR0_LIBS += \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
- endif
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
  $(call VBOX_SET_VER_INFO_R0,VBoxDTraceR0,VBoxDTrace Core (ring-0))
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -475 +475 @@
 tstLdrObjR0_LIBS = \
         $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-ifeq ($(VBOX_LDR_FMT),pe)
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
+if1of ($(VBOX_LDR_FMT),pe lx)
  tstLdrObjR0_LIBS += \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
-        $(TARGET_tstLdr-4Imp)
-endif
-ifeq ($(VBOX_LDR_FMT),lx)
- tstLdrObjR0_LIBS += \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
         $(TARGET_tstLdr-4Imp)
 endif
@@ -773 +768 @@
 tstRTR0DbgKrnlInfo_SYSSUFF = .r0
 tstRTR0DbgKrnlInfo_SOURCES = tstRTR0DbgKrnlInfo.cpp
-tstRTR0DbgKrnlInfo_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0DbgKrnlInfo_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0DbgKrnlInfo_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0DbgKrnlInfoDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
@@ -799 +793 @@
 tstRTR0MemUserKernel_SYSSUFF = .r0
 tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp
-tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0MemUserKernel_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0MemUserKernelDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
@@ -824 +817 @@
 tstRTR0SemMutex_SYSSUFF = .r0
 tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp
-tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0SemMutex_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0SemMutexDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
@@ -849 +841 @@
 tstRTR0Thread_SYSSUFF = .r0
 tstRTR0Thread_SOURCES = tstRTR0Thread.cpp
-tstRTR0Thread_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0Thread_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0Thread_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0ThreadDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
@@ -874 +865 @@
 tstRTR0Timer_SYSSUFF = .r0
 tstRTR0Timer_SOURCES = tstRTR0Timer.cpp
-tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0Timer_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0TimerDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
@@ -899 +889 @@
 tstRTR0ThreadPreemption_SYSSUFF = .r0
 tstRTR0ThreadPreemption_SOURCES = tstRTR0ThreadPreemption.cpp
-tstRTR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(VBOX_LDR_FMT), pe lx)
- tstRTR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+tstRTR0ThreadPreemption_LIBS = \
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
  tstRTR0ThreadPreemptionDriverHardened_TEMPLATE = VBoxR3HardenedTstExe

trunk/src/VBox/VMM/Makefile.kmk

@@ -574 +574 @@
         $(PATH_STAGE_LIB)/ServicesR0$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB)
- ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
-VMMR0_LIBS += \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
- endif
+        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
  ifdef VBOX_WITH_NATIVE_NEM
 VMMR0_SOURCES.win.amd64 += \

trunk/src/VBox/ValidationKit/Config.kmk

@@ -136 +136 @@
 TEMPLATE_VBoxValidationKitR0_DEFS = IN_RT_R0
 TEMPLATE_VBoxValidationKitR0_LIBS = \
-        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
-if1of ($(KBUILD_TARGET),os2 win)
- TEMPLATE_VBoxValidationKitR0_LIBS += \
-        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-endif
+        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
+        $(VBOX_LIB_SUPR0)
 
 #