d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with REL records that have the addend embedded variable sized targets

Browse Source 
rather than the RELA table.  I dont know if bintutils will ever generate
REL records, but just in case.....
This commit is contained in:
peter 2004-05-17 21:16:49 +00:00
parent 5299a4a0f7
commit d0605f2d9e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/amd64/amd64/elf_machdep.c
View File

@ -119,9 +119,18 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
case ELF_RELOC_REL: case ELF_RELOC_REL:
rel = (const Elf_Rel *)data; rel = (const Elf_Rel *)data;
where = (Elf_Addr *) (relocbase + rel->r_offset); where = (Elf_Addr *) (relocbase + rel->r_offset);
addend = *where;
rtype = ELF_R_TYPE(rel->r_info); rtype = ELF_R_TYPE(rel->r_info);
symidx = ELF_R_SYM(rel->r_info); symidx = ELF_R_SYM(rel->r_info);
/* Addend is 32 bit on 32 bit relocs */
switch (rtype) {
case R_X86_64_PC32:
case R_X86_64_32S:
addend = *(Elf32_Addr *)where;
break;
default:
addend = *where;
break;
}
break; break;
case ELF_RELOC_RELA: case ELF_RELOC_RELA:
rela = (const Elf_Rela *)data; rela = (const Elf_Rela *)data;
@ -136,7 +145,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
switch (rtype) { switch (rtype) {
case R_X86_64_NONE: /* none */ case R_X86_64_NONE: /* none */
break; break;