Changeset 93344 in vbox

Timestamp:

Jan 19, 2022 12:53:08 PM (3 years ago)

Author:

vboxsync

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

149421

Message:

/Config.kmk: Added a VBoxR3StaticExeNoAsan for use as parent for VBOXR3AUTOTST on older windows build systems doing ASAN builds. This is to deal with the ASAN runtime error 'ASan requires the Windows 10-only API, QueryVirtualMemoryInformation'. bugref:8489 bugref:9841

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -6248 +6248 @@
 
 #
+# A no-ASAN version of VBoxR3Static for things like that automatically executed tests.
+# Note! No IPRT here as we do not build a non-ASAN static IPRT library.
+#
+TEMPLATE_VBoxR3StaticExeNoAsan = VBoxR3Static but w/o ASAN
+TEMPLATE_VBoxR3StaticExeNoAsan_EXTENDS     = VBoxR3Static
+if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
+ TEMPLATE_VBoxR3StaticExeNoAsan_CFLAGS     = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3Static_CFLAGS))
+ TEMPLATE_VBoxR3StaticExeNoAsan_CXXFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3Static_CXXFLAGS))
+ TEMPLATE_VBoxR3StaticExeNoAsan_PCHFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3Static_PCHFLAGS))
+ TEMPLATE_VBoxR3StaticExeNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
+ TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan-i386.lib   %clang_rt.asan_cxx-i386.lib  , $(TEMPLATE_VBoxR3Static_LIBS.x86))
+ TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan-x86_64.lib %clang_rt.asan_cxx-x86_64.lib, $(TEMPLATE_VBoxR3Static_LIBS.amd64))
+endif
+TEMPLATE_VBoxR3StaticExeNoAsan_LIBS        = $(filter-out $(VBOX_LIB_RUNTIME_STATIC)   , $(TEMPLATE_VBoxR3Static_LIBS))
+
+#
 # A DLL capable version of VBoxR3Static
 #
+## @todo make VBoxR3StaticDll work on non-windows.
 TEMPLATE_VBoxR3StaticDll             = VBox Static Ring-3 DLL
 TEMPLATE_VBoxR3StaticDll_EXTENDS     = VBoxR3Static
@@ -6263 +6280 @@
 TEMPLATE_VBoxR3StaticDllNoAsan = VBoxR3StaticDll but w/o ASAN
 TEMPLATE_VBoxR3StaticDllNoAsan_EXTENDS     = VBoxR3StaticDll
-TEMPLATE_VBoxR3StaticDllNoAsan_CFLAGS      = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CFLAGS))
-TEMPLATE_VBoxR3StaticDllNoAsan_CXXFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CXXFLAGS))
-TEMPLATE_VBoxR3StaticDllNoAsan_PCHFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_PCHFLAGS))
-TEMPLATE_VBoxR3StaticDllNoAsan_LDFLAGS     = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3StaticDll_LDFLAGS))
+if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
+ TEMPLATE_VBoxR3StaticDllNoAsan_CFLAGS     = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CFLAGS))
+ TEMPLATE_VBoxR3StaticDllNoAsan_CXXFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CXXFLAGS))
+ TEMPLATE_VBoxR3StaticDllNoAsan_PCHFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_PCHFLAGS))
+ TEMPLATE_VBoxR3StaticDllNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3StaticDll_LDFLAGS))
+ TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan_dll_thunk-i386.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.x86))
+ TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan_dll_thunk-x86_64.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.amd64))
+endif
 TEMPLATE_VBoxR3StaticDllNoAsan_LIBS        = $(filter-out $(VBOX_LIB_RUNTIME_STATIC)   , $(TEMPLATE_VBoxR3StaticDll_LIBS))
-TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.x86    = $(filter-out %clang_rt.asan_dll_thunk-i386.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.x86))
-TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.amd64  = $(filter-out %clang_rt.asan_dll_thunk-x86_64.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.amd64))
+
 
 #
@@ -6541 +6561 @@
 TEMPLATE_VBOXR3AUTOTST  = VBox Ring 3 Testcase Exe
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXR3AUTOTST_EXTENDS = VBoxR3Static
- TEMPLATE_VBOXR3AUTOTST_LIBS    = $(NO_SUCH_VARIABLE)
- TEMPLATE_VBOXR3AUTOTST_SDKS    = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS))
+ if "$(KBUILD_HOST_VERSION)" vge "10.0.0.0.10240"  # The windows ASAN requires windows 10 APIs to work.
+  TEMPLATE_VBOXR3AUTOTST_EXTENDS   = VBoxR3Static
+ else
+  TEMPLATE_VBOXR3AUTOTST_EXTENDS   = VBoxR3StaticExeNoAsan
+ endif
+ TEMPLATE_VBOXR3AUTOTST_SDKS       = $(filter-out VBOX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_SDKS))
+ TEMPLATE_VBOXR3AUTOTST_LIBS       = $(NO_SUCH_VARIABLE)
+ ifdef VBOX_SIGNING_MODE
+  TEMPLATE_VBOXR3AUTOTST_LDFLAGS   = $(filter-out -IntegrityCheck, $(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_LDFLAGS))
+  TEMPLATE_VBOXR3AUTOTST_POST_CMDS = $(NO_SUCH_VARIABLE)
+ endif
 else
- TEMPLATE_VBOXR3AUTOTST_EXTENDS = VBOXR3EXE
-endif
-TEMPLATE_VBOXR3AUTOTST_INST    = $(INST_TESTCASE)
-if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
- TEMPLATE_VBOXR3AUTOTST_POST_CMDS = $(NO_SUCH_VARIABLE)
- TEMPLATE_VBOXR3AUTOTST_LDFLAGS = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-endif
+ TEMPLATE_VBOXR3AUTOTST_EXTENDS    = VBOXR3EXE
+endif
+TEMPLATE_VBOXR3AUTOTST_INST        = $(INST_TESTCASE)
 
 #