Replaced addr with addr_t.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7267 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -22,10 +22,10 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
|
|||||||
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len)
|
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len)
|
||||||
{
|
{
|
||||||
struct Elf32_Sym *sym;
|
struct Elf32_Sym *sym;
|
||||||
addr S;
|
addr_t S;
|
||||||
addr A;
|
addr_t A;
|
||||||
addr P;
|
addr_t P;
|
||||||
addr final_val;
|
addr_t final_val;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
S = A = P = 0;
|
S = A = P = 0;
|
||||||
@@ -60,7 +60,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
|
|||||||
case R_386_RELATIVE:
|
case R_386_RELATIVE:
|
||||||
case R_386_GOTOFF:
|
case R_386_GOTOFF:
|
||||||
case R_386_GOTPC:
|
case R_386_GOTPC:
|
||||||
A = *(addr *)(image->regions[0].delta + rel[i].r_offset);
|
A = *(addr_t *)(image->regions[0].delta + rel[i].r_offset);
|
||||||
TRACE(("A %p\n", (void *)A));
|
TRACE(("A %p\n", (void *)A));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -97,7 +97,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
|
|||||||
dprintf("arch_elf_relocate_rel: unhandled relocation type %d\n", ELF32_R_TYPE(rel[i].r_info));
|
dprintf("arch_elf_relocate_rel: unhandled relocation type %d\n", ELF32_R_TYPE(rel[i].r_info));
|
||||||
return EPERM;
|
return EPERM;
|
||||||
}
|
}
|
||||||
*(addr *)(image->regions[0].delta + rel[i].r_offset) = final_val;
|
*(addr_t *)(image->regions[0].delta + rel[i].r_offset) = final_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
return B_NO_ERROR;
|
return B_NO_ERROR;
|
||||||
|
|||||||
Reference in New Issue
Block a user