From: Gerd Hoffmann <kraxel@redhat.com>
New naming convention for the configs: UEFI-${efiarch}-${compiler}.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
---
CryptoPkg/Library/OpensslLib/UefiAsm.conf | 41 +++++++----------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/CryptoPkg/Library/OpensslLib/UefiAsm.conf b/CryptoPkg/Library/OpensslLib/UefiAsm.conf
index c3940b5886..907582f93e 100644
--- a/CryptoPkg/Library/OpensslLib/UefiAsm.conf
+++ b/CryptoPkg/Library/OpensslLib/UefiAsm.conf
@@ -8,41 +8,24 @@
##
my %targets = (
-#### UEFI
- "UEFI-x86" => {
- perlasm_scheme => "win32n",
- # inherit_from => [ "UEFI", asm("x86_asm") ],
+ "UEFI-IA32-MSFT" => {
inherit_from => [ "UEFI" ],
- cpuid_asm_src => "x86cpuid.s",
- aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
- sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s",
- modes_asm_src => "ghash-x86.s",
+ perlasm_scheme => "win32n",
+ asm_arch => "x86",
},
- "UEFI-x86-GCC" => {
- perlasm_scheme => "elf",
- # inherit_from => [ "UEFI", asm("x86_asm") ],
+ "UEFI-IA32-GCC" => {
inherit_from => [ "UEFI" ],
- cpuid_asm_src => "x86cpuid.s",
- aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
- sha1_asm_src => "sha1-586.s sha256-586.s sha512-586.s",
- modes_asm_src => "ghash-x86.s",
+ perlasm_scheme => "elf",
+ asm_arch => "x86",
},
- "UEFI-x86_64" => {
- perlasm_scheme => "nasm",
- # inherit_from => [ "UEFI", asm("x86_64_asm") ],
+ "UEFI-X64-MSFT" => {
inherit_from => [ "UEFI" ],
- cpuid_asm_src => "x86_64cpuid.s",
- aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
- sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s",
- modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s",
+ perlasm_scheme => "nasm",
+ asm_arch => "x86_64",
},
- "UEFI-x86_64-GCC" => {
- perlasm_scheme => "elf",
- # inherit_from => [ "UEFI", asm("x86_64_asm") ],
+ "UEFI-X64-GCC" => {
inherit_from => [ "UEFI" ],
- cpuid_asm_src => "x86_64cpuid.s",
- aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
- sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s",
- modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s",
+ perlasm_scheme => "elf",
+ asm_arch => "x86_64",
},
);
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107344): https://edk2.groups.io/g/devel/message/107344
Mute This Topic: https://groups.io/mt/100406039/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-