forked from pool/grub2
b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 12d83a4bded734551415df888bd80b97fdb3d4ad Mon Sep 17 00:00:00 2001
|
|
From: Ram Pai <linuxram@us.ibm.com>
|
|
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 <linuxram@us.ibm.com>
|
|
---
|
|
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
|