From nobody Wed Oct 30 22:14:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105256+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105256+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684937177; cv=none; d=zohomail.com; s=zohoarc; b=Sr1IppyGP74oCsEh6QVMV7hruDyHpbE1jALx26jRIOROAup5+raFKiFB614HS2nwm+hbFHDMY2AjNSv1Jwea4Omfe1rT4cTOwtV7BWd24ggMdTI+eXsD8okFi9qxxsTPWBN3XDWwyi3ttKajId3omqCER8Qrmhao9gStuIOCLqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684937177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=e2dmVp85cw2L8tHJctkiU4Pj8lQExHPF+0d4DafonHQ=; b=HYjYdb0IzuLQQRGC/IekRSK4Dsjs4tuwL14q/BwCEEZlgTtVogo3A2hA+uTlLOXhl9FnkbIjqoVNc0U/Tbw9sa/3qe+saWo76ARvXVK9ndq/gfnr/Fc5NsnuopC/ESy86mufJvRQ0BUdfdoTsn/8/ogGkXIxPIfXi4xVCnJ3HkI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105256+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1684937177466991.6562880630796; Wed, 24 May 2023 07:06:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id u9HnYY1788612xHTk7Ox7vdu; Wed, 24 May 2023 07:06:17 -0700 X-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.web11.9766.1684937176519095759 for ; Wed, 24 May 2023 07:06:16 -0700 X-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-496-oTG_cQ7iN0i6ZdidvyQbjA-1; Wed, 24 May 2023 10:06:12 -0400 X-MC-Unique: oTG_cQ7iN0i6ZdidvyQbjA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA8F38032FA; Wed, 24 May 2023 14:06:09 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85C2340C6EC4; Wed, 24 May 2023 14:06:09 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BEC1D1803085; Wed, 24 May 2023 16:06:00 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Daniel Schaefer , =?UTF-8?q?Marvin=20H=C3=A4user?= , Rebecca Cran , Oliver Steffen , Liming Gao , Pawel Polawski , Chao Li , Ard Biesheuvel , Bob Feng , Sunil V L , Michael D Kinney , Leif Lindholm , Dongyan Qian , Yuwei Chen , Baoqi Zhang , Zhiguang Liu , Gerd Hoffmann Subject: [edk2-devel] [PATCH v6 08/11] BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks Date: Wed, 24 May 2023 16:05:57 +0200 Message-Id: <20230524140600.1432056-9-kraxel@redhat.com> In-Reply-To: <20230524140600.1432056-1-kraxel@redhat.com> References: <20230524140600.1432056-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: XbkXNN0nTNmQYSXk87IoF8I9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1684937177; bh=1X4QqkqiF6z1VOFN6mAsRtkpNNsltMzG1QMlcHxvLrk=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=pGgsj2XPvNJBs2Nh4Y64VxpO23C2JKZY2jZMvI0oNn8taU2Cpz3n74nsXUQ8ExXeJV6 hEkyPLPz3N0qf0+CC1ZAXCg8bK1lGYps+pTdHX70Ycs1A6Vi1ICy0eHG/WfaF+WMCYA6x vIB/OFlTmKWU36ZMgsfT+Yz0zKQIpyjslas= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1684937179220100021 Content-Type: text/plain; charset="utf-8"; x-default="true" The #define for IMAGE_FILE_MACHINE_ARM is not present in MdePkg, this looks like a relic not used any more. Remove. Signed-off-by: Gerd Hoffmann Reviewed-by: Liming Gao Reviewed-by: Rebecca Cran --- BaseTools/Source/C/Common/BasePeCoff.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/BaseTools/Source/C/Common/BasePeCoff.c b/BaseTools/Source/C/Co= mmon/BasePeCoff.c index b8bfb7b58b91..0172370174b6 100644 --- a/BaseTools/Source/C/Common/BasePeCoff.c +++ b/BaseTools/Source/C/Common/BasePeCoff.c @@ -176,25 +176,10 @@ PeCoffLoaderCheckImageType ( ImageContext->Machine !=3D EFI_IMAGE_MACHINE_AARCH64 && \ ImageContext->Machine !=3D EFI_IMAGE_MACHINE_RISCV64 && \ ImageContext->Machine !=3D EFI_IMAGE_MACHINE_LOONGARCH64) { - if (ImageContext->Machine =3D=3D IMAGE_FILE_MACHINE_ARM) { - // - // There are two types of ARM images. Pure ARM and ARM/Thumb. - // If we see the ARM say it is the ARM/Thumb so there is only - // a single machine type we need to check for ARM. - // - ImageContext->Machine =3D EFI_IMAGE_MACHINE_ARMT; - if (ImageContext->IsTeImage =3D=3D FALSE) { - PeHdr->Pe32.FileHeader.Machine =3D ImageContext->Machine; - } else { - TeHdr->Machine =3D ImageContext->Machine; - } - - } else { - // - // unsupported PeImage machine type - // - return RETURN_UNSUPPORTED; - } + // + // unsupported PeImage machine type + // + return RETURN_UNSUPPORTED; } =20 // --=20 2.40.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105256): https://edk2.groups.io/g/devel/message/105256 Mute This Topic: https://groups.io/mt/99109304/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-