mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2024-11-28 18:43:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle r_addend and R_X86_64_PLT32 properly.

Browse Source 
- r_addend should be applied for PLT entries as well
- R_X86_64_PLT32 should be handled just like R_X86_64_PC32
- spec says GLOB_DAT and JUMP_SLOT don't need r_addend (not tested)
  http://www.x86-64.org/documentation/abi.pdf

Now we can -run ELF objects generated by GCC.
This commit is contained in:
Shinichiro Hamaji 2010-12-28 16:14:30 +09:00
parent 48e325df3c
commit 0ae39f1957
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tccelf.c
View File

@ -543,7 +543,6 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
val = sym->st_value;
#ifdef TCC_TARGET_X86_64
/* XXX: not tested */
val += rel->r_addend;
#endif
type = ELFW(R_TYPE)(rel->r_info);
@ -715,7 +714,9 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
}
*(int *)ptr += val;
break;
case R_X86_64_PC32: {
case R_X86_64_PC32:
case R_X86_64_PLT32: {
long long diff;
if (s1->output_type == TCC_OUTPUT_DLL) {
/* DLL relocation */
@ -733,7 +734,7 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
#ifndef TCC_TARGET_PE
/* XXX: naive support for over 32bit jump */
if (s1->output_type == TCC_OUTPUT_MEMORY) {
val = add_jmp_table(s1, val);
val = add_jmp_table(s1, val) + rel->r_addend;
diff = val - addr;
}
#endif
@ -744,12 +745,10 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
*(int *)ptr += diff;
}
break;
case R_X86_64_PLT32:
*(int *)ptr += val - addr;
break;
case R_X86_64_GLOB_DAT:
case R_X86_64_JUMP_SLOT:
*(int *)ptr = val;
/* They don't need addend */
*(int *)ptr = val - rel->r_addend;
break;
case R_X86_64_GOTPCREL:
#ifndef TCC_TARGET_PE