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.129.124]) by mx.groups.io with SMTP id smtpd.web10.69891.1679570266788079637 for ; Thu, 23 Mar 2023 04:17:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LoFVUlK7; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679570265; 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=VKiaMkbShpeDioGUO20gbN6cD9Ygu5XAvelPokMIc+w=; b=LoFVUlK73Cgo0WuMN0kmeEL6WVcwT3ta0SoPsZ9Yo9tbsE2n7HkASXEKlhlZbvytwFGWlu Mr38R0tTvyYrSNLELyIeQUdbFCJg8vimnVSTMirxnESddfxWfIcZXWB92QVs9HW8UJgP5a nlaOz1Gro10lklTm54J4Ypc5MPkJrWE= 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-343-8SpJU83nMn6vqZfg6zWlMA-1; Thu, 23 Mar 2023 07:17:44 -0400 X-MC-Unique: 8SpJU83nMn6vqZfg6zWlMA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88A0985A5A3; Thu, 23 Mar 2023 11:17:43 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.241]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47D9DC15BA0; Thu, 23 Mar 2023 11:17:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B0A341800627; Thu, 23 Mar 2023 12:17:33 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Leif Lindholm , Pawel Polawski , Bob Feng , Sunil V L , =?UTF-8?q?Marvin=20H=C3=A4user?= , Chao Li , Dongyan Qian , Michael D Kinney , Zhiguang Liu , Yuwei Chen , Liming Gao , Ard Biesheuvel , Baoqi Zhang , Oliver Steffen , Daniel Schaefer , Gerd Hoffmann Subject: [PATCH 5/8] BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks Date: Thu, 23 Mar 2023 12:17:30 +0100 Message-Id: <20230323111733.690211-6-kraxel@redhat.com> In-Reply-To: <20230323111733.690211-1-kraxel@redhat.com> References: <20230323111733.690211-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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 --- 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 30400d1341dc..78ef072bc354 100644 --- a/BaseTools/Source/C/Common/BasePeCoff.c +++ b/BaseTools/Source/C/Common/BasePeCoff.c @@ -195,25 +195,10 @@ Routine Description: 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.39.2