Drop /MERGE from linker flags in DSC

Mattiwatti · Oct 15, 2023 · 0f5dca4 · 0f5dca4
1 parent b77c489
commit 0f5dca4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/EfiGuard.props b/EfiGuard.props
@@ -68,7 +68,7 @@
       <UACUIAccess />
       <TypeLibraryResourceID />
       <AdditionalOptions>/ALIGN:0x200 /FILEALIGN:0x200 /SECTION:.pdata,!D /SECTION:.xdata,!D /OPT:ICF=10 /IGNORE:4254 /IGNORE:4281 /NOVCFEATURE /NOCOFFGRPINFO /PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
-      <MergeSections>.rdata=.text</MergeSections>
+      <MergeSections>.rdata=.data</MergeSections>
       <LinkErrorReporting />
       <ProfileGuidedDatabase />
       <EntryPointSymbol>EfiMain</EntryPointSymbol>

diff --git a/EfiGuardPkg.dsc b/EfiGuardPkg.dsc
@@ -95,8 +95,8 @@
   MSFT:*_*_*_CC_FLAGS = /Qspectre-
 
   # Use sane linker flags instead of EDK2 defaults
-  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:0x1000 /FILEALIGN:0x200 /SECTION:.pdata,!D /SECTION:.xdata,!D /MERGE:.rdata=.text /DEBUG:FULL /NOVCFEATURE /NOCOFFGRPINFO /PDBALTPATH:%_PDB%
-  INTEL:*_*_*_DLINK_FLAGS = /ALIGN:0x1000 /FILEALIGN:0x200 /SECTION:.pdata,!D /SECTION:.xdata,!D /MERGE:.rdata=.text /DEBUG:FULL /NOVCFEATURE /NOCOFFGRPINFO /PDBALTPATH:%_PDB%
+  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:0x1000 /FILEALIGN:0x200 /SECTION:.pdata,!D /SECTION:.xdata,!D /DEBUG:FULL /NOVCFEATURE /NOCOFFGRPINFO /PDBALTPATH:%_PDB%
+  INTEL:*_*_*_DLINK_FLAGS = /ALIGN:0x1000 /FILEALIGN:0x200 /SECTION:.pdata,!D /SECTION:.xdata,!D /DEBUG:FULL /NOVCFEATURE /NOCOFFGRPINFO /PDBALTPATH:%_PDB%
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANGPDB"
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 !else if $(TOOL_CHAIN_TAG) == "CLANGPDB"