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
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 8212195e18301ed18a060722e2b5933d2052b2c1 Mon Sep 17 00:00:00 2001
|
|
From: Ram Pai <linuxram@us.ibm.com>
|
|
Date: Tue, 25 Feb 2014 18:59:13 +0000
|
|
Subject: [PATCH 20/23] handle .TOC. symbol while loading
|
|
|
|
.TOC. symbol is special in ppc64le . It maps to the
|
|
address of the .toc section.
|
|
|
|
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
|
|
---
|
|
grub-core/kern/dl.c | 34 +++++++++++++++++++++++++++++++++-
|
|
1 file changed, 33 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
|
index de2d0ed..ce2ff38 100644
|
|
--- a/grub-core/kern/dl.c
|
|
+++ b/grub-core/kern/dl.c
|
|
@@ -343,6 +343,26 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
+#ifdef __powerpc64le__
|
|
+static int
|
|
+grub_dl_find_section_index (Elf_Ehdr *e, const char *name)
|
|
+{
|
|
+ Elf_Shdr *s;
|
|
+ const char *str;
|
|
+ unsigned i;
|
|
+
|
|
+ s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
|
|
+ str = (char *) e + s->sh_offset;
|
|
+
|
|
+ for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
|
+ i < e->e_shnum;
|
|
+ i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
|
+ if (grub_strcmp (str + s->sh_name, name) == 0)
|
|
+ return i;
|
|
+ return -1;
|
|
+}
|
|
+#endif
|
|
+
|
|
static grub_err_t
|
|
grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
|
|
{
|
|
@@ -392,7 +412,19 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
|
|
/* Resolve a global symbol. */
|
|
if (sym->st_name != 0 && sym->st_shndx == 0)
|
|
{
|
|
- grub_symbol_t nsym = grub_dl_resolve_symbol (name);
|
|
+ grub_symbol_t nsym;
|
|
+
|
|
+#ifdef __powerpc64le__
|
|
+ if (grub_strcmp(name, ".TOC.") == 0) {
|
|
+ int j = grub_dl_find_section_index (e, ".toc");
|
|
+ if (j < 0)
|
|
+ return grub_error (GRUB_ERR_BAD_MODULE,
|
|
+ N_("section '.toc' not found"), name);
|
|
+ sym->st_value = (Elf_Addr) grub_dl_get_section_addr (mod, j);
|
|
+ break;
|
|
+ }
|
|
+#endif
|
|
+ nsym = grub_dl_resolve_symbol (name);
|
|
if (! nsym)
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
|
N_("symbol `%s' not found"), name);
|
|
--
|
|
1.8.3.1
|