i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We now have text_region and data_region instead of the unclear array.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7878 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-09 02:52:17 +00:00
parent 2705fb7df0
commit 9d256ebb6e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/arch/x86/arch_elf.c
+4 -4
View File
@@ -60,7 +60,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
case R_386_RELATIVE:
case R_386_GOTOFF:
case R_386_GOTPC:
A = *(addr_t *)(image->regions[0].delta + rel[i].r_offset);
A = *(addr_t *)(image->text_region.delta + rel[i].r_offset);
TRACE(("A %p\n", (void *)A));
break;
}
@@ -70,7 +70,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
case R_386_GOT32:
case R_386_PLT32:
case R_386_GOTPC:
P = image->regions[0].delta + rel[i].r_offset;
P = image->text_region.delta + rel[i].r_offset;
TRACE(("P %p\n", (void *)P));
break;
}
@@ -86,7 +86,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
break;
case R_386_RELATIVE:
// B + A;
final_val = image->regions[0].delta + A;
final_val = image->text_region.delta + A;
break;
case R_386_JMP_SLOT:
case R_386_GLOB_DAT:
@@ -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));
return EPERM;
}
*(addr_t *)(image->regions[0].delta + rel[i].r_offset) = final_val;
*(addr_t *)(image->text_region.delta + rel[i].r_offset) = final_val;
}
return B_NO_ERROR;