Changeset 96593 in vbox for trunk/src/VBox

Timestamp:

Sep 4, 2022 5:34:04 PM (2 years ago)

Author:

vboxsync

Message:

/Config.kmk,IPRT,ValKit/Config.kmk: Found an undocumented linker option for keeping the .idata stuff out of .rdata, so, dropping the .rodata tweaks and using this option instead. bugref:10261

Location:

trunk/src/VBox

Files:

• Runtime/common/compiler/vcc/initializers-c-cpp-vcc.cpp (modified) (1 diff)
• Runtime/common/compiler/vcc/tlsdir-vcc.c (modified) (1 diff)
• ValidationKit/Config.kmk (modified) (1 diff)

trunk/src/VBox/Runtime/common/compiler/vcc/initializers-c-cpp-vcc.cpp

@@ -81 +81 @@
 
 /* Tell the linker to merge the .CRT* sections into .rdata */
-#ifdef IPRT_VCC_USING_RODATA_AS_CONST_SEG
-# pragma comment(linker, "/merge:.CRT=.rodata ")
-#else
-# pragma comment(linker, "/merge:.CRT=.rdata ")
-#endif
+#pragma comment(linker, "/merge:.CRT=.rdata ")
 /** @} */
 

trunk/src/VBox/Runtime/common/compiler/vcc/tlsdir-vcc.c

@@ -65 +65 @@
 
 /* Tell the linker to merge the .CRT* sections into .rdata */
-#ifdef IPRT_VCC_USING_RODATA_AS_CONST_SEG
-# pragma comment(linker, "/merge:.CRT=.rodata ")
-#else
-# pragma comment(linker, "/merge:.CRT=.rdata ")
-#endif
+#pragma comment(linker, "/merge:.CRT=.rdata ")
 /** @} */
 

trunk/src/VBox/ValidationKit/Config.kmk

@@ -115 +115 @@
         -Section:.bss,RW!K
 endif
+TEMPLATE_VBoxValidationKitR3_LDFLAGS.win.x86 += -NoOptIData
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
  TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBOXVALIDATIONKITR3BASE_POST_CMDS)$$(NLTAB)