Changeset 93277 in vbox for trunk

Timestamp:

Jan 17, 2022 3:27:12 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,SUPDrv-win.cpp: Run the security cookie initializer for .r0 modules. [x86 build fixes] bugref:10162

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5058 +5058 @@
  ifneq ($(VBOX_VCC_CC_GUARD_CF),)
 TEMPLATE_VBoxR0_LDFLAGS.win.amd64  += -Include:__security_init_cookie  -Export:ModuleInitSecurityCookie=__security_init_cookie
-TEMPLATE_VBoxR0_LDFLAGS.win.x86    += -Include:___security_init_cookie -Export:ModuleInitSecurityCookie=___security_init_cookie
+TEMPLATE_VBoxR0_LDFLAGS.win.x86    += -Include:___security_init_cookie -Export:ModuleInitSecurityCookie=__security_init_cookie
  endif
 TEMPLATE_VBoxR0_LIBS                = \

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -540 +540 @@
 VBoxSupLib_LIBS.win.amd64 = \
         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt.lib # for __chkstk
-VBoxSupLib_VBOX_IMPORT_CHECKER.win.x86   = w2k
+VBoxSupLib_VBOX_IMPORT_CHECKER.win.x86   = xp
 VBoxSupLib_VBOX_IMPORT_CHECKER.win.amd64 = xp64