vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-07-01 Pavel Roskin <proski@gnu.org>

Browse source 
* include/grub/elf.h: Define Elf_Sword and Elf_Xword.
	* kern/i386/dl.c: Use ELF symbols without "32" or "64".
	* kern/powerpc/dl.c: Likewise.
	* kern/sparc64/dl.c: Likewise.
	* kern/x86_64/dl.c: Likewise.
This commit is contained in:
proski 2009-07-01 14:49:22 +00:00
parent 3f7f0cd003
commit 3262295617
6 changed files with 76 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kern/x86_64/dl.c
View file

@ -90,9 +90,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
addr32 = (Elf64_Word *) ((char *) seg->addr + rel->r_offset);
addr64 = (Elf64_Xword *) addr32;
sym = (Elf64_Sym *) ((char *) mod->symtab
+ entsize * ELF64_R_SYM (rel->r_info));
+ entsize * ELF_R_SYM (rel->r_info));
switch (ELF64_R_TYPE (rel->r_info))
switch (ELF_R_TYPE (rel->r_info))
{
case R_X86_64_64:
*addr64 += rel->r_addend + sym->st_value;
@ -109,7 +109,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
break;
default:
grub_fatal ("Unrecognized relocation: %d\n", ELF64_R_TYPE (rel->r_info));
grub_fatal ("Unrecognized relocation: %d\n", ELF_R_TYPE (rel->r_info));
}
}
}