CryptoPkg: Update to build with RVCT

Update RVCT compile options for the CryptoPkg to compile.
Add support for stack protector with BaseStackCheckLib to link.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>
Reviewed-By: Long, Qin <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15911 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 046a6cefcdc40b4a1697fa1b804a3f9de911e777..80e37067bb83bf109e822f0019e5a87a513abcf9 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -59,6 +59,9 @@
   #\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 +83,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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 5b3c421055d25b91ebfc143919d9bbc9d01cdd84..c891eea4da8f1253075bf20cf1eeb76db67a8811 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -667,6 +667,7 @@
    #  144: a value of type <type> cannot be used to initialize an entity of type <type>\r
    #  513: a value of type <type> cannot be assigned to an entity of type <type>\r
    #  188: enumerated type mixed with another type (i.e. passing an integer as an enum without a cast)\r
-   RVCT:*_*_ARM_CC_FLAGS                  = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DTHIRTY_TWO_BIT --diag_suppress=1295,550,1293,111,68,177,223,144,513,188\r
+   # 1296: Extended constant initialiser used\r
+   RVCT:*_*_ARM_CC_FLAGS                  = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DTHIRTY_TWO_BIT --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188\r
    XCODE:*_*_IA32_CC_FLAGS                = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT\r
    XCODE:*_*_X64_CC_FLAGS                 = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r