From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web11.4376.1617863574613824727 for ; Wed, 07 Apr 2021 23:32:55 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) IronPort-SDR: nSoUe3XUtEexG+m2ORwTiQWlUs6KGIWyoU0xa47H9kWK7Vob5QViQ4bdINsNh/nz+hEim5tagc Ov3sY7pPhJpQ== X-IronPort-AV: E=McAfee;i="6000,8403,9947"; a="254810016" X-IronPort-AV: E=Sophos;i="5.82,205,1613462400"; d="scan'208";a="254810016" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2021 23:32:53 -0700 IronPort-SDR: cCmfqdgiwgxELjU6dpZVcctRqoyqhrd9q46DkDkhfa3bQQU65MhdqNIdi4BJGVvMftY0QVemtO lEjT1eGwaveQ== X-IronPort-AV: E=Sophos;i="5.82,205,1613462400"; d="scan'208";a="530488472" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.252.133.10]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2021 23:32:49 -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 2/3] CryptoPkg/Library/Include: Allow CPU specific defines to be predefined Date: Wed, 7 Apr 2021 23:32:39 -0700 Message-Id: <20210408063240.877-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20210408063240.877-1-michael.d.kinney@intel.com> References: <20210408063240.877-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 | 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