From 12d83a4bded734551415df888bd80b97fdb3d4ad Mon Sep 17 00:00:00 2001 From: Ram Pai Date: Wed, 26 Feb 2014 10:28:13 +0000 Subject: [PATCH 06/23] set the ABI version correctly set the ABI version to 0x02 in the e_flag of the PPC64LE ELF image. Signed-off-by: Ram Pai --- include/grub/elf.h | 1 + util/grub-mkimagexx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/grub/elf.h b/include/grub/elf.h index caa7963..bee7583 100644 --- a/include/grub/elf.h +++ b/include/grub/elf.h @@ -1851,6 +1851,7 @@ typedef Elf32_Addr Elf32_Conflict; /* Values for Elf32/64_Ehdr.e_flags. */ #define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */ +#define EF_PPC64LE_ABIV2 0x00000002 /* PowerPC 64 LE flag */ /* Cygnus local bits below */ #define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/ diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c index 0a1ac9e..b1833a1 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -141,11 +141,15 @@ SUFFIX (generate_elf) (const struct grub_install_image_target_desc *image_target phdr->p_vaddr = grub_host_to_target32 (target_addr); phdr->p_paddr = grub_host_to_target32 (target_addr); phdr->p_align = grub_host_to_target32 (align > image_target->link_align ? align : image_target->link_align); + if (image_target->id == IMAGE_LOONGSON_ELF) ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER | EF_MIPS_PIC | EF_MIPS_CPIC); + else if (image_target->id == IMAGE_PPC && image_target->bigendian == 0) + ehdr->e_flags = grub_host_to_target32 (EF_PPC64LE_ABIV2); else ehdr->e_flags = 0; + if (image_target->id == IMAGE_LOONGSON_ELF) { phdr->p_filesz = grub_host_to_target32 (*core_size); -- 1.8.3.1