From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.14702.1678696225668541823 for ; Mon, 13 Mar 2023 01:30:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CgFIPzHO; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678696224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H6mICgUxGovdMjKyqi5UJoyNKzt1E5LHuRvND5yClJQ=; b=CgFIPzHO9nirqFahNy1zlzVXRv72nNT+HipfIuD6O5E3xnYj+0eVmrKcq+1Hn3o6blnZbQ vJMna/J1BkQlMm7LdqLLgx114Z3Gybsge8Jd4IAFx6ovUm6xBKmAtzlnCEDNFpBbBCiZTU 6RVQ2ROp5zUw3vuOhG884939oArrdak= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-402-5CvaVhliMFGoG-HfhWa_Ug-1; Mon, 13 Mar 2023 04:30:23 -0400 X-MC-Unique: 5CvaVhliMFGoG-HfhWa_Ug-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 13383830F81; Mon, 13 Mar 2023 08:30:23 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C40221410F1B; Mon, 13 Mar 2023 08:30:22 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4C5231801E83; Mon, 13 Mar 2023 09:30:16 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jian J Wang , Pawel Polawski , Xiaoyu Lu , Ard Biesheuvel , Guomin Jiang , Gerd Hoffmann , Jiewen Yao , Oliver Steffen , Jordan Justen Subject: [PATCH 05/22] CryptoPkg/openssl: UefiAsm.conf update for openssl 3.0, add aarch64 Date: Mon, 13 Mar 2023 09:29:59 +0100 Message-Id: <20230313083016.136448-6-kraxel@redhat.com> In-Reply-To: <20230313083016.136448-1-kraxel@redhat.com> References: <20230313083016.136448-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true New naming convention for the configs: UEFI-${efiarch}-${compiler}. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/UefiAsm.conf | 44 +++++++++-------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/UefiAsm.conf b/CryptoPkg/Library/OpensslLib/UefiAsm.conf index c3940b5886a4..ffb845862c52 100644 --- a/CryptoPkg/Library/OpensslLib/UefiAsm.conf +++ b/CryptoPkg/Library/OpensslLib/UefiAsm.conf @@ -8,41 +8,29 @@ ## my %targets = ( -#### UEFI - "UEFI-x86" => { + "UEFI-IA32-MSFT" => { + inherit_from => [ "UEFI" ], perlasm_scheme => "win32n", - # inherit_from => [ "UEFI", asm("x86_asm") ], - 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", + asm_arch => "x86", }, - "UEFI-x86-GCC" => { + "UEFI-IA32-GCC" => { + inherit_from => [ "UEFI" ], perlasm_scheme => "elf", - # inherit_from => [ "UEFI", asm("x86_asm") ], - 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", + asm_arch => "x86", }, - "UEFI-x86_64" => { + "UEFI-X64-MSFT" => { + inherit_from => [ "UEFI" ], perlasm_scheme => "nasm", - # inherit_from => [ "UEFI", asm("x86_64_asm") ], - 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", + asm_arch => "x86_64", }, - "UEFI-x86_64-GCC" => { + "UEFI-X64-GCC" => { + inherit_from => [ "UEFI" ], perlasm_scheme => "elf", - # inherit_from => [ "UEFI", asm("x86_64_asm") ], + asm_arch => "x86_64", + }, + "UEFI-AARCH64-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 => "aarch64", }, ); -- 2.39.2