ImageTool: Made compilation of EFI_IMAGE_MACHINE selection conditional.

This commit is contained in:
Mikhail Krichanov 2023-03-17 16:12:34 +03:00 committed by Marvin Häuser
parent 373bb081ee
commit 7abc3faeec

View File

@ -791,18 +791,21 @@ ScanElf (
mImageInfo.DebugInfo.SymbolsPathLen = strlen (ElfName); mImageInfo.DebugInfo.SymbolsPathLen = strlen (ElfName);
switch (mEhdr->e_machine) { switch (mEhdr->e_machine) {
case EM_386: #if defined(EFI_TARGET64)
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_IA32;
break;
case EM_X86_64: case EM_X86_64:
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_X64; mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_X64;
break; break;
case EM_ARM:
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED;
break;
case EM_AARCH64: case EM_AARCH64:
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_AARCH64; mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_AARCH64;
break; break;
#elif defined(EFI_TARGET32)
case EM_386:
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_IA32;
break;
case EM_ARM:
mImageInfo.HeaderInfo.Machine = EFI_IMAGE_MACHINE_ARMTHUMB_MIXED;
break;
#endif
default: default:
fprintf (stderr, "ImageTool: Unknown ELF architecture %d\n", mEhdr->e_machine); fprintf (stderr, "ImageTool: Unknown ELF architecture %d\n", mEhdr->e_machine);
free (mEhdr); free (mEhdr);