Acked-by: Zhichao Gao <zhichao....@intel.com> > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Leif Lindholm > Sent: Thursday, September 5, 2019 12:38 AM > To: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: devel@edk2.groups.io; Carsey, Jaben <jaben.car...@intel.com>; Ni, Ray > <ray...@intel.com>; Gao, Zhichao <zhichao....@intel.com>; Gao, Liming > <liming....@intel.com> > Subject: Re: [edk2-devel] [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable > stack protector > > On Wed, Sep 04, 2019 at 09:34:34AM -0700, Ard Biesheuvel wrote: > > Incorporate the stack protector library into the AARCH64 build of the > > Shell binaries as a NULL library resolution, to avoid build errors > > when the compiler injects stack integrity checks. > > > > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > > Surprised we hadn't triggered this earlier. > Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org> > > > > --- > > ShellPkg/ShellPkg.dsc | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index > > b2065dc028d8..91493400cab7 100644 > > --- a/ShellPkg/ShellPkg.dsc > > +++ b/ShellPkg/ShellPkg.dsc > > @@ -58,7 +58,7 @@ > > DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > > > > > ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseR > ep > > ortStatusCodeLibNull.inf > > > > -[LibraryClasses.ARM] > > +[LibraryClasses.ARM,LibraryClasses.AARCH64] > > # > > # It is not possible to prevent the ARM compiler for generic intrinsic > functions. > > # This library provides the instrinsic functions generate by a given > compiler. > > @@ -69,9 +69,6 @@ > > # Add support for GCC stack protector > > NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > > > > -[LibraryClasses.AARCH64] > > - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > > - > > [PcdsFixedAtBuild] > > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF > > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|16000 > > -- > > 2.17.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#46859): https://edk2.groups.io/g/devel/message/46859 Mute This Topic: https://groups.io/mt/33140662/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
