[efi] Fix the 32-bit version of elf2efi64

Currently, if elf2efi.c is compiled using a 32-bit HOST_CC, then the
resulting elf2efi64 binary will generate 32-bit EFI binaries instead
of 64-bit EFI binaries.

The problem is that elf2efi.c uses the MDE_CPU_* definitions to decide
whether to output a 32-bit or 64-bit PE binary.  However, MDE_CPU_*
gets defined in ProcessorBind.h, depending on the compiler's target
architecture.  Overriding them on the command line doesn't work in the
expected way, and you can end up in cases where both MDE_CPU_IA32 and
MDE_CPU_X64 are defined.

Fix by using a separate definition, EFI_TARGET_IA32/EFI_TARGET_X64,
which is specified only on the command line.

Signed-off-by: Geoff Lywood <glywood@vmware.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 6da75178283589f85abffb89b5e0ba137f99bdf3..7278c283977089b57d8102074ba1b88ae2e5590a 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -907,12 +907,12 @@ ELF2EFI_CFLAGS    := -I$(BINUTILS_DIR)/include -I$(BFD_DIR)/include \
 
 $(ELF2EFI32) : util/elf2efi.c $(MAKEDEPS)
        $(QM)$(ECHO) "  [HOSTCC] $@"
-       $(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DMDE_CPU_IA32 -O2 -o $@
+       $(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DEFI_TARGET_IA32 -O2 -o $@
 CLEANUP += $(ELF2EFI32)
 
 $(ELF2EFI64) : util/elf2efi.c $(MAKEDEPS)
        $(QM)$(ECHO) "  [HOSTCC] $@"
-       $(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DMDE_CPU_X64 -O2 -o $@
+       $(Q)$(HOST_CC) $< $(ELF2EFI_CFLAGS) -DEFI_TARGET_X64 -O2 -o $@
 CLEANUP += $(ELF2EFI64)
 
 $(EFIROM) : util/efirom.c $(MAKEDEPS)

diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index 1d73807e9f82b96ecdf9510aa8fff8a6d64952c2..e66292966d3eed7c5baee0ffdc0367a10f56a4e2 100644 (file)
--- a/src/util/elf2efi.c
+++ b/src/util/elf2efi.c
@@ -52,9 +52,9 @@ struct pe_relocs {
 struct pe_header {
        EFI_IMAGE_DOS_HEADER dos;
        uint8_t padding[128];
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
        EFI_IMAGE_NT_HEADERS32 nt;
-#elif defined(MDE_CPU_X64)
+#elif defined(EFI_TARGET_X64)
        EFI_IMAGE_NT_HEADERS64 nt;
 #endif
 };
@@ -67,24 +67,24 @@ static struct pe_header efi_pe_header = {
        .nt = {
                .Signature = EFI_IMAGE_NT_SIGNATURE,
                .FileHeader = {
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
                        .Machine = EFI_IMAGE_MACHINE_IA32,
-#elif defined(MDE_CPU_X64)
+#elif defined(EFI_TARGET_X64)
                        .Machine = EFI_IMAGE_MACHINE_X64,
 #endif
                        .TimeDateStamp = 0x10d1a884,
                        .SizeOfOptionalHeader =
                                sizeof ( efi_pe_header.nt.OptionalHeader ),
                        .Characteristics = ( EFI_IMAGE_FILE_DLL |
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
                                             EFI_IMAGE_FILE_32BIT_MACHINE |
 #endif
                                             EFI_IMAGE_FILE_EXECUTABLE_IMAGE ),
                },
                .OptionalHeader = {
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
                        .Magic = EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC,
-#elif defined(MDE_CPU_X64)
+#elif defined(EFI_TARGET_X64)
                        .Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC,
 #endif
                        .SectionAlignment = EFI_FILE_ALIGN,
@@ -345,9 +345,9 @@ static struct pe_section * process_section ( bfd *bfd,
        /* Extract current RVA limits from file header */
        code_start = pe_header->nt.OptionalHeader.BaseOfCode;
        code_end = ( code_start + pe_header->nt.OptionalHeader.SizeOfCode );
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
        data_start = pe_header->nt.OptionalHeader.BaseOfData;
-#elif defined(MDE_CPU_X64)
+#elif defined(EFI_TARGET_X64)
        data_start = code_end;
 #endif
        data_mid = ( data_start +
@@ -434,7 +434,7 @@ static struct pe_section * process_section ( bfd *bfd,
        /* Write RVA limits back to file header */
        pe_header->nt.OptionalHeader.BaseOfCode = code_start;
        pe_header->nt.OptionalHeader.SizeOfCode = ( code_end - code_start );
-#if defined(MDE_CPU_IA32)
+#if defined(EFI_TARGET_IA32)
        pe_header->nt.OptionalHeader.BaseOfData = data_start;
 #endif
        pe_header->nt.OptionalHeader.SizeOfInitializedData =