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

* include/grub/elf.h: Rename R_PPC to GRUB_R_PPC to avoid collisions.

Browse source 
All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-18 21:09:57 +02:00
parent ef76bec332
commit c62d1a0c64
3 changed files with 137 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/kern/powerpc/dl.c
View file

@ -70,7 +70,7 @@ grub_arch_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
max = rel + s->sh_size / s->sh_entsize;
rel < max;
rel++)
if (ELF_R_TYPE (rel->r_info) == R_PPC_REL24)
if (ELF_R_TYPE (rel->r_info) == GRUB_ELF_R_PPC_REL24)
(*tramp)++;
}
@ -155,11 +155,11 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
value = sym->st_value + rel->r_addend;
switch (ELF_R_TYPE (rel->r_info))
{
case R_PPC_ADDR16_LO:
case GRUB_ELF_R_PPC_ADDR16_LO:
*(Elf_Half *) addr = value;
break;
case R_PPC_REL24:
case GRUB_ELF_R_PPC_REL24:
{
Elf_Sword delta = value - (Elf_Word) addr;
@ -182,15 +182,15 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
break;
}
case R_PPC_ADDR16_HA:
case GRUB_ELF_R_PPC_ADDR16_HA:
*(Elf_Half *) addr = (value + 0x8000) >> 16;
break;
case R_PPC_ADDR32:
case GRUB_ELF_R_PPC_ADDR32:
*addr = value;
break;
case R_PPC_REL32:
case GRUB_ELF_R_PPC_REL32:
*addr = value - (Elf_Word) addr;
break;