diff options
| author | Matthijs Lavrijsen <mattiwatti@gmail.com> | 2023-10-15 04:31:58 +0200 |
|---|---|---|
| committer | Matthijs Lavrijsen <mattiwatti@gmail.com> | 2023-10-15 04:31:58 +0200 |
| commit | 0f5dca4e65471b3685fdea8c8a82c1c2cc066fbb (patch) | |
| tree | a1a70d683581f365c7c3a2fe58fe373a1f98226b | |
| parent | b77c4896c6135404383edee03a9143cce4e7ef2e (diff) | |
Drop /MERGE from linker flags in DSCv1.4
| -rw-r--r-- | EfiGuard.props | 2 | ||||
| -rw-r--r-- | EfiGuardPkg.dsc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/EfiGuard.props b/EfiGuard.props index aa2c7ce..4f1e7bb 100644 --- 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 index 8f39d99..c735344 100644 --- 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" |