Changeset 91768 in vbox for trunk/src/VBox/Runtime

Timestamp:

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

Author:

vboxsync

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

147543

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

File:

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

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