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.web11.9766.1684937176519095759 for ; Wed, 24 May 2023 07:06:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hw01RVFV; 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=1684937175; 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=b43mytmTeKYyKfFCNv3iSCZgBTDTs+lMrLzf/Vt1eU8=; b=Hw01RVFVWHqUsv1g1a6uCwoPF6IzIY10iwTUESk8rFwWhdcetWGlmAGvsvU/J2cAfnD+YU VN7BvxWDhwe16QA/Zhg4ygZOdi92KD/jp55Ly5hMLzDP1Cu0OCJd7oOFkzOEoSCXiaSEJ5 /OfUeuDGZLBZk7QosbVJDNmx4SFakGo= 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 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) 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) 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: [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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; 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/Common/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 != EFI_IMAGE_MACHINE_AARCH64 && \ ImageContext->Machine != EFI_IMAGE_MACHINE_RISCV64 && \ ImageContext->Machine != EFI_IMAGE_MACHINE_LOONGARCH64) { - if (ImageContext->Machine == 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 = EFI_IMAGE_MACHINE_ARMT; - if (ImageContext->IsTeImage == FALSE) { - PeHdr->Pe32.FileHeader.Machine = ImageContext->Machine; - } else { - TeHdr->Machine = ImageContext->Machine; - } - - } else { - // - // unsupported PeImage machine type - // - return RETURN_UNSUPPORTED; - } + // + // unsupported PeImage machine type + // + return RETURN_UNSUPPORTED; } // -- 2.40.1