sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_*

Browse Source 
Use the newer versions of the machine #defines.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Chao Li <lichao@loongson.cn>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
This commit is contained in:
Gerd Hoffmann
2023-05-24 22:05:58 +08:00
committed by mergify[bot]
parent fdc6288f81
commit c15941a643
7 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BaseTools/Source/C/Common/BasePeCoff.c
View File

@ -169,13 +169,13 @@ PeCoffLoaderCheckImageType (
ImageContext->Machine = TeHdr->Machine;
}
if (ImageContext->Machine != EFI_IMAGE_MACHINE_IA32 && \
ImageContext->Machine != EFI_IMAGE_MACHINE_X64 && \
ImageContext->Machine != EFI_IMAGE_MACHINE_ARMT && \
ImageContext->Machine != EFI_IMAGE_MACHINE_EBC && \
ImageContext->Machine != EFI_IMAGE_MACHINE_AARCH64 && \
ImageContext->Machine != EFI_IMAGE_MACHINE_RISCV64 && \
ImageContext->Machine != EFI_IMAGE_MACHINE_LOONGARCH64) {
if (ImageContext->Machine != IMAGE_FILE_MACHINE_I386 && \
ImageContext->Machine != IMAGE_FILE_MACHINE_X64 && \
ImageContext->Machine != IMAGE_FILE_MACHINE_ARMTHUMB_MIXED && \
ImageContext->Machine != IMAGE_FILE_MACHINE_EBC && \
ImageContext->Machine != IMAGE_FILE_MACHINE_ARM64 && \
ImageContext->Machine != IMAGE_FILE_MACHINE_RISCV64 && \
ImageContext->Machine != IMAGE_FILE_MACHINE_LOONGARCH64) {
//
// unsupported PeImage machine type
//
@ -759,16 +759,16 @@ PeCoffLoaderRelocateImage (
default:
switch (MachineType) {
case EFI_IMAGE_MACHINE_IA32:
case IMAGE_FILE_MACHINE_I386:
Status = PeCoffLoaderRelocateIa32Image (Reloc, Fixup, &FixupData, Adjust);
break;
case EFI_IMAGE_MACHINE_ARMT:
case IMAGE_FILE_MACHINE_ARMTHUMB_MIXED:
Status = PeCoffLoaderRelocateArmImage (&Reloc, Fixup, &FixupData, Adjust);
break;
case EFI_IMAGE_MACHINE_RISCV64:
case IMAGE_FILE_MACHINE_RISCV64:
Status = PeCoffLoaderRelocateRiscVImage (Reloc, Fixup, &FixupData, Adjust);
break;
case EFI_IMAGE_MACHINE_LOONGARCH64:
case IMAGE_FILE_MACHINE_LOONGARCH64:
Status = PeCoffLoaderRelocateLoongArch64Image (Reloc, Fixup, &FixupData, Adjust);
break;
default:
@ -1255,14 +1255,14 @@ PeCoffLoaderGetPdbPointer (
// generate PE32+ image with PE32 Magic.
//
switch (Hdr.Pe32->FileHeader.Machine) {
case EFI_IMAGE_MACHINE_IA32:
case EFI_IMAGE_MACHINE_ARMT:
case IMAGE_FILE_MACHINE_I386:
case IMAGE_FILE_MACHINE_ARMTHUMB_MIXED:
//
// Assume PE32 image with IA32 Machine field.
//
Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC;
break;
case EFI_IMAGE_MACHINE_X64:
case IMAGE_FILE_MACHINE_X64:
//
// Assume PE32+ image with X64 Machine field
//