File grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-... of Package grub2.2117

Overview Repositories Revisions Requests Users Attributes Meta

File grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch of Package grub2.2117

From b94389e81084af714c6e6ad71d50e64174018c39 Mon Sep 17 00:00:00 2001
From: Ram Pai <linuxram@us.ibm.com>
Date: Tue, 25 Feb 2014 01:35:51 +0000
Subject: [PATCH 12/23] GRUB_ELF_R_PPC_* processing fix

GRUB_ELF_R_PPC_* processing is applicable only for 32
 bit bootloader.

Signed-off-by: Ram Pai <linuxram@us.ibm.com>
---
 grub-core/kern/powerpc/dl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/grub-core/kern/powerpc/dl.c b/grub-core/kern/powerpc/dl.c
index 3a7fa3e..7677e5a 100644
--- a/grub-core/kern/powerpc/dl.c
+++ b/grub-core/kern/powerpc/dl.c
@@ -94,6 +94,7 @@ grub_err_t
 grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
 			       Elf_Shdr *s, grub_dl_segment_t seg)
 {
+#ifdef powerpc
   Elf_Rela *rel, *max;
 
   for (rel = (Elf_Rela *) ((char *) ehdr + s->sh_offset),
@@ -155,7 +156,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
 	case GRUB_ELF_R_PPC_REL32:
 	  *addr = value - (Elf_Word) addr;
 	  break;
-
 	default:
 	  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 			     N_("relocation 0x%x is not implemented yet"),
@@ -164,4 +164,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
     }
 
   return GRUB_ERR_NONE;
+#else
+  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+     N_("relocation is not implemented yet for module=%llx ehdr=%llx Elf_Shdr=%llx seg=%llx"), 
+     mod, ehdr, s, seg);
+#endif
 }
-- 
1.8.3.1

Places

File grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch of Package grub2.2117

Places