Changeset 92796 in vbox for trunk

Timestamp:

Dec 7, 2021 11:24:51 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk: The VBOXGUESTR3EXE template (base for all ring-3 GA bits) must set IN_RT_STATIC because declspec(dllexport) makes the /Gy option useless on RTDECL & RTR3DECL functions. Added /Gw, which does the same to data as /Gy does to code. Reduces the bin/addition size from 40.1 MiB to 25.3 MiB, saving around 37%. Also applied the /Gw option to VBOXR3STATIC.

File:

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

trunk/Config.kmk

@@ -5843 +5843 @@
  TEMPLATE_VBOXR3STATIC_PCHFLAGS        = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_PCHFLAGS)) -MT$(VBOX_VCC_CRT_TYPE) -Gy
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" # Do not use SSE so valkit stuff can run on NT4 w/o needing a separate runtime library.
-  TEMPLATE_VBOXR3STATIC_CFLAGS.win.x86   = $(TEMPLATE_VBOXR3EXE_CFLAGS.win.86) /arch:IA32 -Gw
-  TEMPLATE_VBOXR3STATIC_CXXFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win.86) /arch:IA32 -Gw
-  TEMPLATE_VBOXR3STATIC_PCHFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_PCHFLAGS.win.86) /arch:IA32 -Gw
- endif
- TEMPLATE_VBOXR3STATIC_LDFLAGS         = $(filter-out /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE).lib /DISALLOWLIB:libcpmt$(VBOX_VCC_CRT_TYPE).lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
+  TEMPLATE_VBOXR3STATIC_CFLAGS.win.x86     = $(TEMPLATE_VBOXR3EXE_CFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXR3STATIC_CXXFLAGS.win.x86   = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXR3STATIC_PCHFLAGS.win.x86   = $(TEMPLATE_VBOXR3EXE_PCHFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXR3STATIC_CFLAGS            += -Gw
+  TEMPLATE_VBOXR3STATIC_CXXFLAGS          += -Gw
+  TEMPLATE_VBOXR3STATIC_PCHFLAGS          += -Gw
+ endif
+ TEMPLATE_VBOXR3STATIC_LDFLAGS             = $(filter-out /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE).lib /DISALLOWLIB:libcpmt$(VBOX_VCC_CRT_TYPE).lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
         /DISALLOWLIB:msvcrt.lib \
         /DISALLOWLIB:msvcrtd.lib \
@@ -7722 +7725 @@
  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE) -Gy
  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120" # Do not use SSE so the binaries might works on NT4 and earlier.
-  TEMPLATE_VBOXGUESTR3EXE_CFLAGS.win.x86   = $(TEMPLATE_VBOXR3EXE_CFLAGS.win.86) /arch:IA32 -Gw
-  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win.86) /arch:IA32 -Gw
-  TEMPLATE_VBOXGUESTR3EXE_PCHFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_PCHFLAGS.win.86) /arch:IA32 -Gw
+  TEMPLATE_VBOXGUESTR3EXE_CFLAGS.win.x86   = $(TEMPLATE_VBOXR3EXE_CFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXGUESTR3EXE_PCHFLAGS.win.x86 = $(TEMPLATE_VBOXR3EXE_PCHFLAGS.win.86) /arch:IA32
+  TEMPLATE_VBOXGUESTR3EXE_CFLAGS          += -Gw
+  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS        += -Gw
+  TEMPLATE_VBOXGUESTR3EXE_PCHFLAGS        += -Gw
  endif
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE).lib /DISALLOWLIB:libcpmt$(VBOX_VCC_CRT_TYPE).lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
@@ -7777 +7783 @@
 endif
 TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
-TEMPLATE_VBOXGUESTR3EXE_DEFS     := $(filter-out $(ARCH_BITS_DEFS) VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3, $(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 IN_RT_R3 $(VBOX_GC_ARCH_BITS_DEFS) RT_NEED_NEW_AND_DELETE
+TEMPLATE_VBOXGUESTR3EXE_DEFS     := \
+        $(filter-out $(ARCH_BITS_DEFS) VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R3, $(TEMPLATE_VBOXR3EXE_DEFS)) \
+        IN_GUEST \
+        IN_GUEST_R3 \
+        IN_RT_R3 \
+        IN_RT_STATIC \
+        $(VBOX_GC_ARCH_BITS_DEFS) \
+        RT_NEED_NEW_AND_DELETE
 TEMPLATE_VBOXGUESTR3EXE_DEFS.linux := $(TEMPLATE_VBOXR3EXE_DEFS.linux) LOG_USE_C99 RT_WITHOUT_EXEC_ALLOC
 ifeq ($(KBUILD_TARGET),linux) # As few libs as possible on linux.