File grub2-ppc64le-21-the-.toc-section-in-powerpc64l... of Package grub2.2117

Overview Repositories Revisions Requests Users Attributes Meta

File grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch of Package grub2.2117

From 584206ed234f18aab8c9e41e869b539003c56c44 Mon Sep 17 00:00:00 2001
From: Ram Pai <linuxram@us.ibm.com>
Date: Tue, 25 Feb 2014 20:49:28 +0000
Subject: [PATCH 21/23] fix the .toc section alignment

the .toc section in powerpc64le modules are sometimes
 not aligned on a four byte boundary. This fails the module linker especially
 when processing R_PPC64_TOC16_LO_DS, since the addresses are expected to be
 aligned on 4byte boundary.

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

diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index ce2ff38..ee69c3c 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -304,7 +304,12 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
 	    {
 	      void *addr;
 
+#ifdef __powerpc64le__
+	      ptr = (char *) ALIGN_UP ((grub_addr_t) ptr,
+                             (s->sh_addralign < 4 ? 4 : s->sh_addralign));
+#else
 	      ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, s->sh_addralign);
+#endif
 	      addr = ptr;
 	      ptr += s->sh_size;
 
-- 
1.8.3.1

Places

File grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch of Package grub2.2117

Places