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.11143.1681483178445391020 for ; Fri, 14 Apr 2023 07:39:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q8rEu2PC; 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=1681483177; 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: in-reply-to:in-reply-to:references:references; bh=wzI2b7M0xeN60JMyYNM53+eklLTdFVGIrovNZ2Os/do=; b=Q8rEu2PC0CXqdzLjUdo4BLFnldkB5dQ+xx0h4v/4flt9E7ztGIrJ7BSQFSkMso5OOm209p EOcJdGCppVxxiISE8ixkKVXy22vVV+HA+YCai2E99q2X6uuokhutFAin/QkIrT8lF1HAEl 783+c8VLBjyXLhmbIZCMwmkU/O8ZR80= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-467-n7hKSXASOs-ghxrFV_ym6g-1; Fri, 14 Apr 2023 10:39:32 -0400 X-MC-Unique: n7hKSXASOs-ghxrFV_ym6g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A79ED3C184E9; Fri, 14 Apr 2023 14:39:31 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BDF8492C14; Fri, 14 Apr 2023 14:39:31 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2C0B71800081; Fri, 14 Apr 2023 16:39:25 +0200 (CEST) Date: Fri, 14 Apr 2023 16:39:25 +0200 From: "Gerd Hoffmann" To: Rebecca Cran Cc: devel@edk2.groups.io, Pawel Polawski , Dongyan Qian , Sunil V L , Baoqi Zhang , Chao Li , Ard Biesheuvel , Zhiguang Liu , Liming Gao , Yuwei Chen , Marvin =?utf-8?Q?H=C3=A4user?= , Leif Lindholm , Michael D Kinney , Daniel Schaefer , Bob Feng , Oliver Steffen Subject: Re: [edk2-devel] [PATCH v4 08/10] BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* Message-ID: References: <20230414080250.1357004-1-kraxel@redhat.com> <20230414080250.1357004-9-kraxel@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Apr 14, 2023 at 06:16:52AM -0600, Rebecca Cran wrote: > On 4/14/23 02:02, Gerd Hoffmann wrote: > > > diff --git a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h > > index 22161edf443d..fb867b5660a9 100644 > > --- a/BaseTools/Source/C/Include/IndustryStandard/PeImage.h > > +++ b/BaseTools/Source/C/Include/IndustryStandard/PeImage.h > > @@ -42,6 +42,7 @@ > > #define IMAGE_FILE_MACHINE_X64 0x8664 > > #define IMAGE_FILE_MACHINE_ARM 0x01c0 // Thumb only > > #define IMAGE_FILE_MACHINE_ARMT 0x01c2 // 32bit Mixed ARM and Thumb/Thumb 2 Little Endian > > +#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED IMAGE_FILE_MACHINE_ARMT > > #define IMAGE_FILE_MACHINE_ARM64 0xAA64 // 64bit ARM Architecture, Little Endian > > #define IMAGE_FILE_MACHINE_RISCV64 0x5064 // 64bit RISC-V ISA > > #define IMAGE_FILE_MACHINE_LOONGARCH64 0x6264 // 64bit LoongArch Architecture > > Has this passed CI/uncrustify? I think it would complain about the alignment > here. CI doesn't complain, but I think BaseTools are excluded from uncrustify checking. take care, Gerd