Changeset 107325 in vbox

Timestamp:

Dec 13, 2024 6:11:36 PM (2 months ago)

Author:

vboxsync

Message:

/Config.kmk,ValKit/Config.kmk: Moved the stupid signing/AV hack from ValKit to VBoxR3Exe and all its descendants.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/ValidationKit/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -6403 +6403 @@
   TEMPLATE_VBoxR3Exe_LDFLAGS.asan       = -InferAsanLibs:No
  endif
+ # HACK ALERT! The changing of .text to .x86code is to prevent some stupid AV software from falsely classfying bs3-timing-1.exe,
+ # tstRTNoCrt-5.exe and others as problematic and tripping up the code signing process. The .rdata -> .rodata is probably not
+ # needed (but could help since changing the amount of string data generated from */err.h also helps avoiding false positives).
+ TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86   += -Merge:.text=.x86code -Merge:.rdata=.rodata
+ TEMPLATE_VBoxR3Exe_LDFLAGS.win.amd64 += -Merge:.text=.x86code -Merge:.rdata=.rodata
 
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
@@ -6453 +6458 @@
   TEMPLATE_VBoxR3Exe_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB)$(TEMPLATE_VBoxR3Exe_POST_CMDS))
   TEMPLATE_VBoxR3Exe_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
-  TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86   = \
+  TEMPLATE_VBoxR3Exe_LDFLAGS.win.x86  += \
         -Include:_vcc100_kernel32_fakes_cpp \
         -Include:_vcc100_kernel32_fakes_asm

trunk/src/VBox/ValidationKit/Config.kmk

@@ -52 +52 @@
 # static version of our own libraries and not the system libs.
 #
-# HACK ALERT! The changing of .text to .x86code is to prevent some stupid AV
-#             software from falsly classifying bs3-timing-1.exe as problmatic
-#             and tripping up the signing process.  The .rdata -> .rodata is
-#             probably not needed (but could help since changing the amount
-#             of string data generated from */err.h makes a difference).
-#
 TEMPLATE_VBoxValidationKitR3Base = VBox Validation Kit ring-3 program base, both guest and host.
 TEMPLATE_VBoxValidationKitR3Base_EXTENDS          = VBoxR3Static
 ifeq ($(KBUILD_TARGET),win)
  TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
- TEMPLATE_VBoxValidationKitR3Base_LDFLAGS.x86     = $(TEMPLATE_VBoxR3Static_LDFLAGS.x86)   -Merge:.rdata=.rodata -Merge:.text=.x86code
- TEMPLATE_VBoxValidationKitR3Base_LDFLAGS.amd64   = $(TEMPLATE_VBoxR3Static_LDFLAGS.amd64) -Merge:.rdata=.rodata -Merge:.text=.x86code
 else ifn1of ($(KBUILD_TARGET), darwin solaris win)
  TEMPLATE_VBoxValidationKitR3Base_CFLAGS          = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CFLAGS))