From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: liming.gao@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Sun, 19 May 2019 04:59:53 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 May 2019 04:59:53 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 19 May 2019 04:59:53 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 19 May 2019 04:59:53 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 19 May 2019 04:59:52 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.10]) with mapi id 14.03.0415.000; Sun, 19 May 2019 19:59:50 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Gao, Liming" CC: "Justen, Jordan L" , "Laszlo Ersek (lersek@redhat.com)" , "ard.biesheuvel@linaro.org" Subject: Re: [edk2-devel] [Patch 7/7] OvmfPkg: Update DSC/FDF to support CLANG8ELF tool chain Thread-Topic: [edk2-devel] [Patch 7/7] OvmfPkg: Update DSC/FDF to support CLANG8ELF tool chain Thread-Index: AQHU/D5l/k2tdedueUO3ab6KIYlkkKZye9Yg Date: Sun, 19 May 2019 11:59:50 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E44D0E9@SHSMSX104.ccr.corp.intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> <15990D503F545BBC.4588@groups.io> In-Reply-To: <15990D503F545BBC.4588@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDgwYWY1NDctMjE3Ni00ZTI1LThiZGUtNTA2MWU1MDFlZDlkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaUdqOXJpTTE4Zmc0b0pDd1Y4YmJkWWEyQkpSVEVqbkgxdFRQSktQeXlmeWl6NzFyK2Y2RDRST0RlbVNqRkRiaSJ9 dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc to OvmfPkg maintainers. Please help review this change.=20 Thanks Liming > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Li= ming 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 CLA= NG8ELF tool chain >=20 > Signed-off-by: Liming Gao > --- > 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(-) >=20 > 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 @@ >=20 > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > # Force PE/COFF sections to be aligned at 4KB boundaries to support pag= e level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SM= M_CORE] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > #######################################################################= ######### > @@ -832,7 +834,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > 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/BootGraphicsResourc= eTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > 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 @@ >=20 > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > # Force PE/COFF sections to be aligned at 4KB boundaries to support pag= e level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SM= M_CORE] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > #######################################################################= ######### > @@ -841,7 +843,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > 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/BootGraphicsResourc= eTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > 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 @@ >=20 > [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > # Force PE/COFF sections to be aligned at 4KB boundaries to support pag= e level > # protection of DXE_SMM_DRIVER/SMM_CORE modules > [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SM= M_CORE] > GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 > + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 > XCODE:*_*_*_DLINK_FLAGS =3D >=20 > #######################################################################= ######### > @@ -839,7 +841,7 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > 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/BootGraphicsResourc= eTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >=20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8E= LF" > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > !endif > INF ShellPkg/Application/Shell/Shell.inf > -- > 2.13.0.windows.1 >=20 >=20 >=20