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

* grub-core/kern/ia64/dl.c (grub_arch_dl_relocate_symbols): Handle

Browse source 
non-function pcrel21b relocation. It happens with .text.unlikely
	section.
This commit is contained in:
Vladimir Serbinenko 2013-12-11 11:28:48 +01:00
parent 16c8f78513
commit 979742bc7e
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ia64/dl.c (grub_arch_dl_relocate_symbols): Handle
non-function pcrel21b relocation. It happens with .text.unlikely
section.
2013-12-10 Leif Lindholm <leif.lindholm@linaro.org>
* make MAX_USABLE_ADDRESS platform-specific

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

@ -76,15 +76,20 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
{
case R_IA64_PCREL21B:
{
grub_uint64_t noff;
struct grub_ia64_trampoline *tr = mod->trampptr;
grub_ia64_make_trampoline (tr, value);
noff = ((char *) tr - (char *) (addr & ~3)) >> 4;
mod->trampptr = tr + 1;
grub_int64_t noff;
if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
{
struct grub_ia64_trampoline *tr = mod->trampptr;
grub_ia64_make_trampoline (tr, value);
noff = ((char *) tr - (char *) (addr & ~3)) >> 4;
mod->trampptr = tr + 1;
}
else
noff = ((char *) value - (char *) (addr & ~3)) >> 4;
if (noff & ~MASK19)
return grub_error (GRUB_ERR_BAD_OS,
"trampoline offset too big (%lx)", noff);
if ((noff & ~MASK19) && ((-noff) & ~MASK19))
return grub_error (GRUB_ERR_BAD_MODULE,
"jump offset too big (%lx)", noff);
grub_ia64_add_value_to_slot_20b (addr, noff);
}
break;