Topics

[Patch 2/3] CryptoPkg/Library/Include: Allow CPU specific defines to be predefined


Michael D Kinney
 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3308

The EDK II Build Specifications do not restrict the set of
CPU architectures that can be supported. Remove places in
the EDK II that assume a fixed set of CPU architectures.

Update SIXTY_FOUR_BIT and THIRTY_TWO_BIT defines in the
CryptoPkg to allow one of them to be predefined on the EDK II
build command line using /D flag or in DSC file [BuildOptions]
sections.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Abner Chang <abner.chang@hpe.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
CryptoPkg/Library/Include/CrtLibSupport.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index 7a82f1d40633..a7d9a768695a 100644
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -44,6 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent

#define CONFIG_HEADER_BN_H

+#if !defined(SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)
#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64)
//
// With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs
@@ -56,6 +57,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#else
#error Unknown target architecture
#endif
+#endif

//
// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h
--
2.31.1.windows.1


Abner Chang
 

Reviewed-by: Abner Chang <abner.chang@hpe.com>

-----Original Message-----
From: Michael D Kinney [mailto:michael.d.kinney@intel.com]
Sent: Thursday, April 8, 2021 2:33 PM
To: devel@edk2.groups.io
Cc: Jiewen Yao <jiewen.yao@intel.com>; Jian J Wang
<jian.j.wang@intel.com>; Xiaoyu Lu <xiaoyux.lu@intel.com>; Guomin Jiang
<guomin.jiang@intel.com>; Andrew Fish <afish@apple.com>; Chang, Abner
(HPS SW/FW Technologist) <abner.chang@hpe.com>
Subject: [Patch 2/3] CryptoPkg/Library/Include: Allow CPU specific defines to
be predefined

REF:
INVALID URI REMOVED
d=3308__;!!NpxR!2-P3Y-
hszCTVv28TDqqSG3TmDAWbHH_z7uQuHZYnM4_Gf5ueOE8v4f32Jklssow$

The EDK II Build Specifications do not restrict the set of
CPU architectures that can be supported. Remove places in
the EDK II that assume a fixed set of CPU architectures.

Update SIXTY_FOUR_BIT and THIRTY_TWO_BIT defines in the
CryptoPkg to allow one of them to be predefined on the EDK II
build command line using /D flag or in DSC file [BuildOptions]
sections.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Abner Chang <abner.chang@hpe.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
CryptoPkg/Library/Include/CrtLibSupport.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
b/CryptoPkg/Library/Include/CrtLibSupport.h
index 7a82f1d40633..a7d9a768695a 100644
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -44,6 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent

#define CONFIG_HEADER_BN_H

+#if !defined(SIXTY_FOUR_BIT) && !defined (THIRTY_TWO_BIT)
#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) ||
defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64)
//
// With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC
needs
@@ -56,6 +57,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#else
#error Unknown target architecture
#endif
+#endif

//
// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h
--
2.31.1.windows.1