grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[RFC PATCH 19/23] align .toc section on 4byte boundary.


From: Ram Pai
Subject: [RFC PATCH 19/23] align .toc section on 4byte boundary.
Date: Wed, 26 Feb 2014 10:31:18 -0800

 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 <address@hidden>
---
 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.5.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]