CryptoPkg: Add support of AARCH64 architecture

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@15913 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 80e37067bb83bf109e822f0019e5a87a513abcf9..2f69b72e8be60665a696dd0eca9b5d90eb0529b2 100644 (file)
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -23,7 +23,7 @@
   PLATFORM_VERSION               = 0.93\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/CryptoPkg\r
   PLATFORM_VERSION               = 0.93\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
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r


@@ -51,11 +51,12 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 \r
   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
   #\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
   #\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 95a76f23fefa7a36a8b103c69832940246926771..bea2e2b8c6e086a34a395129d5712272bd7a88e2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -28,7 +28,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r


@@ -85,6 +85,9 @@
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r

+[Sources.AARCH64]\r
+  Rand/CryptRand.c\r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index 535ad514c6b67beeea05c71054ca465002df58e8..3cf09657382978a7a3cfb9216c09be2eac2947da 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -34,7 +34,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r


@@ -90,6 +90,9 @@
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r

+[Sources.AARCH64]\r
+  Rand/CryptRand.c\r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index b966ecc46b05ba630d4c564746324beb31f4878b..7669ff3e8068bf219d0136b31e9f777f1e58e6be 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -34,7 +34,7 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64\r
+#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r


@@ -90,6 +90,9 @@
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r
 [Sources.ARM]\r
   Rand/CryptRand.c\r
 \r

+[Sources.AARCH64]\r
+  Rand/CryptRand.c\r
+\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 5bf4282c8d5020574d6a92aebc75d693089b3f21..6cfc67d03ca43dcf08230be1f08028d6f5e62842 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -51,7 +51,7 @@
 #\r
   \r
 #\r
 #\r
   \r
 #\r

-#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64\r

 #\r
 \r
 [Sources]\r
 #\r
 \r
 [Sources]\r


@@ -657,6 +657,7 @@
    GCC:*_*_X64_CC_FLAGS                   = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r
    GCC:*_*_IPF_CC_FLAGS                   = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r
    GCC:*_*_ARM_CC_FLAGS                   = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT\r
    GCC:*_*_X64_CC_FLAGS                   = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r
    GCC:*_*_IPF_CC_FLAGS                   = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r
    GCC:*_*_ARM_CC_FLAGS                   = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT\r

+   GCC:*_*_AARCH64_CC_FLAGS               = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT\r

 \r
    # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:\r
    # 1295: Deprecated declaration <entity> - give arg types\r
 \r
    # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:\r
    # 1295: Deprecated declaration <entity> - give arg types\r