[edk2,5/6] SecurityPkg: fix package build on ARM

Message ID 20181101153642.11315-6-leif.lindholm@linaro.org
State Accepted
Commit 2f0a1e6542fd8b9a1ae64105ebcb41dde5faf77d
Headers show
Series
  • fix top-level package builds for AARCH64/ARM
Related show

Commit Message

Leif Lindholm Nov. 1, 2018, 3:36 p.m.
The CompilerIntrinsicsLib and BaseStackCheckLib need to be included in
order for an ARM build of the package .dsc to succeed - so add them.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 SecurityPkg/SecurityPkg.dsc | 11 +++++++++++
 1 file changed, 11 insertions(+)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Yao, Jiewen Nov. 2, 2018, midnight | #1
Reviewed-by: jiewen.yao@intel.com


thank you!
Yao, Jiewen


> 在 2018年11月1日,下午11:36,Leif Lindholm <leif.lindholm@linaro.org> 写道:

> 

> The CompilerIntrinsicsLib and BaseStackCheckLib need to be included in

> order for an ARM build of the package .dsc to succeed - so add them.

> 

> Cc: Chao Zhang <chao.b.zhang@intel.com>

> Cc: Jiewen Yao <jiewen.yao@intel.com>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---

> SecurityPkg/SecurityPkg.dsc | 11 +++++++++++

> 1 file changed, 11 insertions(+)

> 

> diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc

> index 68a2953162..eaccbd9354 100644

> --- a/SecurityPkg/SecurityPkg.dsc

> +++ b/SecurityPkg/SecurityPkg.dsc

> @@ -73,6 +73,17 @@ [LibraryClasses]

>   TcgStorageOpalLib|SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf

>   ResetSystemLib|MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf

> 

> +[LibraryClasses.ARM]

> +  #

> +  # It is not possible to prevent the ARM compiler for generic intrinsic functions.

> +  # This library provides the instrinsic functions generate by a given compiler.

> +  # And NULL mean link this library into all ARM images.

> +  #

> +  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

> +

> +  # Add support for GCC stack protector

> +  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

> +

> [LibraryClasses.common.PEIM]

>   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

>   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

> -- 

> 2.11.0

>

Patch

diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index 68a2953162..eaccbd9354 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -73,6 +73,17 @@  [LibraryClasses]
   TcgStorageOpalLib|SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalLib.inf
   ResetSystemLib|MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
 
+[LibraryClasses.ARM]
+  #
+  # It is not possible to prevent the ARM compiler for generic intrinsic functions.
+  # This library provides the instrinsic functions generate by a given compiler.
+  # And NULL mean link this library into all ARM images.
+  #
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+
+  # Add support for GCC stack protector
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+
 [LibraryClasses.common.PEIM]
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf