From 23908d0f5cc6bc04a0d19f694cd8c2a392077da0 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 4 Sep 2019 09:30:47 -0700 Subject: [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector 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. Reviewed-by: Leif Lindholm Acked-by: Zhichao Gao Signed-off-by: Ard Biesheuvel --- ShellPkg/ShellPkg.dsc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index b2065dc028..91493400ca 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.39.2