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

Fix LTOFF relocation to functions (needed for trampolines)

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-08 17:07:40 +02:00
parent 44748f71c0
commit 2679b7249b
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/kern/ia64/dl.c
View file

@ -250,9 +250,11 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
add_value_to_slot_21 (addr, value - (grub_addr_t) gp); add_value_to_slot_21 (addr, value - (grub_addr_t) gp);
break; break;
case R_IA64_LTOFF_FPTR22:
case R_IA64_LTOFF22X: case R_IA64_LTOFF22X:
case R_IA64_LTOFF22: case R_IA64_LTOFF22:
if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
value = *(grub_uint64_t *) sym->st_value + rel->r_addend;
case R_IA64_LTOFF_FPTR22:
*gpptr = value; *gpptr = value;
add_value_to_slot_21 (addr, (grub_addr_t) gpptr - (grub_addr_t) gp); add_value_to_slot_21 (addr, (grub_addr_t) gpptr - (grub_addr_t) gp);
gpptr++; gpptr++;

13
util/grub-mkimagexx.c
View file

@ -455,9 +455,20 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
} }
break; break;
case R_IA64_LTOFF_FPTR22:
case R_IA64_LTOFF22X: case R_IA64_LTOFF22X:
case R_IA64_LTOFF22: case R_IA64_LTOFF22:
{
Elf_Sym *sym;
sym = (Elf_Sym *) ((char *) e
+ grub_target_to_host32 (symtab_section->sh_offset)
+ ELF_R_SYM (info) * grub_target_to_host32 (symtab_section->sh_entsize));
if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
sym_addr = grub_target_to_host64 (*(grub_uint64_t *) (pe_target
+ sym->st_value
- image_target->vaddr_offset));
}
case R_IA64_LTOFF_FPTR22:
*gpptr = grub_host_to_target64 (addend + sym_addr); *gpptr = grub_host_to_target64 (addend + sym_addr);
add_value_to_slot_21 ((grub_addr_t) target, add_value_to_slot_21 ((grub_addr_t) target,
(char *) gpptr - (char *) pe_target (char *) gpptr - (char *) pe_target