From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.8064.1618370888171322791 for ; Tue, 13 Apr 2021 20:28:08 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: michael.d.kinney@intel.com) IronPort-SDR: H+PA+rcjHfNP1c1deYtPiGabl2S3f8y6y3NjxpTkFmHNv7SF9/Qk1heFA8gNPaM0y5COAui9Lz BOHV4jZ8y6kQ== X-IronPort-AV: E=McAfee;i="6200,9189,9953"; a="181679505" X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="181679505" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 20:28:07 -0700 IronPort-SDR: cy74ZsW5jrD2AbnOpUdv/AAdFP6pg/bQlkSIX2837EW5Sh+Xk+/i3VMAzdfkFYB+UrSkFNBp5W HJRfF+nIbZ6w== X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="418124852" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.231.15]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 20:28:06 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang , Andrew Fish , Abner Chang Subject: [Patch v2 2/4] CryptoPkg/Library/Include: Allow CPU specific defines to be predefined Date: Tue, 13 Apr 2021 20:27:56 -0700 Message-Id: <20210414032758.1818-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20210414032758.1818-1-michael.d.kinney@intel.com> References: <20210414032758.1818-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Cc: Andrew Fish Cc: Abner Chang Signed-off-by: Michael D Kinney --- CryptoPkg/Library/Include/CrtLibSupport.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index 7a82f1d40633..b1dff03bdc0c 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -2,7 +2,7 @@ Root include file of C runtime library to support building the third-party cryptographic library. -Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2021, Intel Corporation. All rights reserved.
Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -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