* [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector @ 2019-09-04 16:34 Ard Biesheuvel 2019-09-04 16:37 ` Leif Lindholm 0 siblings, 1 reply; 4+ messages in thread From: Ard Biesheuvel @ 2019-09-04 16:34 UTC (permalink / raw) To: devel Cc: jaben.carsey, ray.ni, zhichao.gao, leif.lindholm, liming.gao, Ard Biesheuvel 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.biesheuvel@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/BaseReportStatusCodeLibNull.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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector 2019-09-04 16:34 [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector Ard Biesheuvel @ 2019-09-04 16:37 ` Leif Lindholm 2019-09-05 2:20 ` [edk2-devel] " Gao, Zhichao 0 siblings, 1 reply; 4+ messages in thread From: Leif Lindholm @ 2019-09-04 16:37 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: devel, jaben.carsey, ray.ni, zhichao.gao, liming.gao 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.biesheuvel@linaro.org> Surprised we hadn't triggered this earlier. Reviewed-by: Leif Lindholm <leif.lindholm@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/BaseReportStatusCodeLibNull.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 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector 2019-09-04 16:37 ` Leif Lindholm @ 2019-09-05 2:20 ` Gao, Zhichao 2019-09-05 17:21 ` Ard Biesheuvel 0 siblings, 1 reply; 4+ messages in thread From: Gao, Zhichao @ 2019-09-05 2:20 UTC (permalink / raw) To: devel@edk2.groups.io, leif.lindholm@linaro.org, Ard Biesheuvel Cc: Carsey, Jaben, Ni, Ray, Gao, Liming Acked-by: Zhichao Gao <zhichao.gao@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.biesheuvel@linaro.org> > Cc: devel@edk2.groups.io; Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray > <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Gao, Liming > <liming.gao@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.biesheuvel@linaro.org> > > Surprised we hadn't triggered this earlier. > Reviewed-by: Leif Lindholm <leif.lindholm@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 > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector 2019-09-05 2:20 ` [edk2-devel] " Gao, Zhichao @ 2019-09-05 17:21 ` Ard Biesheuvel 0 siblings, 0 replies; 4+ messages in thread From: Ard Biesheuvel @ 2019-09-05 17:21 UTC (permalink / raw) To: Gao, Zhichao Cc: devel@edk2.groups.io, leif.lindholm@linaro.org, Carsey, Jaben, Ni, Ray, Gao, Liming On Wed, 4 Sep 2019 at 19:20, Gao, Zhichao <zhichao.gao@intel.com> wrote: > > Acked-by: Zhichao Gao <zhichao.gao@intel.com> > Thanks Pushed as 04d9d89b7dd4..23908d0f5cc6 > > -----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.biesheuvel@linaro.org> > > Cc: devel@edk2.groups.io; Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray > > <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Gao, Liming > > <liming.gao@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.biesheuvel@linaro.org> > > > > Surprised we hadn't triggered this earlier. > > Reviewed-by: Leif Lindholm <leif.lindholm@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 > > > > > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-05 17:21 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-09-04 16:34 [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector Ard Biesheuvel 2019-09-04 16:37 ` Leif Lindholm 2019-09-05 2:20 ` [edk2-devel] " Gao, Zhichao 2019-09-05 17:21 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox