Check in missing patch for TPM error handling.

[mirror_edk2.git] / CryptoPkg / CryptoPkg.dsc

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 046a6cefcdc40b4a1697fa1b804a3f9de911e777..11465a3d025576322f64d765bc19ea33e67f5d4c 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -20,10 +20,10 @@
 [Defines]\r
   PLATFORM_NAME                  = CryptoPkg\r
   PLATFORM_GUID                  = E1063286-6C8C-4c25-AEF0-67A9A5B6E6B6\r
-  PLATFORM_VERSION               = 0.93\r
+  PLATFORM_VERSION               = 0.94\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/CryptoPkg\r
-  SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM\r
+  SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
@@ -51,14 +51,18 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 \r
-[LibraryClasses.ARM]\r
+[LibraryClasses.ARM, LibraryClasses.AARCH64]\r
   #\r
   # It is not possible to prevent the ARM compiler for generic intrinsic functions.\r
   # This library provides the instrinsic functions generate by a given compiler.\r
-  # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.\r
+  # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library\r
+  # into all ARM and AARCH64 images.\r
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
+  # Add support for stack protector\r
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf\r
+\r
 [LibraryClasses.common.PEIM]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
 \r
@@ -80,6 +84,24 @@
 [LibraryClasses.common.UEFI_APPLICATION]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
 \r
+###############################################################################\r
+#\r
+# BuildOptions Section - Define the module specific tool chain flags that\r
+#                        should be used as the default flags for a module.\r
+#                        These flags are appended to any standard flags that\r
+#                        are defined by the build process.\r
+#\r
+# -JCryptoPkg/Include : To disable the use of the system includes provided by\r
+#                       the RVCT toolchain.\r
+# --diag_remark=1     : To make the warning "#1-D: last line of file ends\r
+#                       without a newline" just a remark such that the\r
+#                       build doesn't stop as warnings are considered as\r
+#                       errors.\r
+#\r
+################################################################################\r
+[BuildOptions]\r
+RVCT:*_*_ARM_CC_FLAGS = -JCryptoPkg/Include --diag_remark=1\r
+\r
 ################################################################################\r
 #\r
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform\r