Cc to OvmfPkg maintainers. Please help review this change. Thanks Liming > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Liming > Gao > Sent: Friday, April 26, 2019 10:43 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [Patch 7/7] OvmfPkg: Update DSC/FDF to support > CLANG8ELF tool chain > > Signed-off-by: Liming Gao <liming....@intel.com> > --- > OvmfPkg/OvmfPkgIa32.dsc | 4 +++- > OvmfPkg/OvmfPkgIa32.fdf | 2 +- > OvmfPkg/OvmfPkgIa32X64.dsc | 4 +++- > OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- > OvmfPkg/OvmfPkgX64.dsc | 4 +++- > OvmfPkg/OvmfPkgX64.fdf | 2 +- > 6 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 98a8467e86..7972b25112 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -73,12 +73,14 @@ > > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > # Force PE/COFF sections to be aligned at 4KB boundaries to support page > level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, > BuildOptions.common.EDKII.SMM_CORE] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > > ################################################################################ > @@ -832,7 +834,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > <PcdsFixedAtBuild> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index bc08bf2243..2894cfe8d6 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -287,7 +287,7 @@ INF > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > !endif > INF ShellPkg/Application/Shell/Shell.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 1f722fc987..c9feeafaae 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -78,12 +78,14 @@ > > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > # Force PE/COFF sections to be aligned at 4KB boundaries to support page > level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, > BuildOptions.common.EDKII.SMM_CORE] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > > ################################################################################ > @@ -841,7 +843,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > <PcdsFixedAtBuild> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index ccf36c5dd9..affce983f9 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -288,7 +288,7 @@ INF > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > !endif > INF ShellPkg/Application/Shell/Shell.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 2927ee07b8..f28ec13c0c 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -78,12 +78,14 @@ > > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > # Force PE/COFF sections to be aligned at 4KB boundaries to support page > level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, > BuildOptions.common.EDKII.SMM_CORE] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS = -z max-page-size=0x1000 > XCODE:*_*_*_DLINK_FLAGS = > > > ################################################################################ > @@ -839,7 +841,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > <PcdsFixedAtBuild> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index ccf36c5dd9..affce983f9 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -288,7 +288,7 @@ INF > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > -!if $(TOOL_CHAIN_TAG) != "XCODE5" > +!if $(TOOL_CHAIN_TAG) != "XCODE5" AND $(TOOL_CHAIN_TAG) != "CLANG8ELF" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > !endif > INF ShellPkg/Application/Shell/Shell.inf > -- > 2.13.0.windows.1 > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40981): https://edk2.groups.io/g/devel/message/40981 Mute This Topic: https://groups.io/mt/31673692/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
