diff options
| author | Michael Matz <matz@suse.de> | 2015-12-17 07:17:34 +0100 |
|---|---|---|
| committer | Michael Matz <matz@suse.de> | 2015-12-17 07:17:34 +0100 |
| commit | c4d0498b3ae3483fa7726500bd03e1f411289fff (patch) | |
| tree | af52639f75121cebe1ebf274774ae26125df4a64 /tccelf.c | |
| parent | d1e15514aaf84bec6fddeaa2bd7b4027b175be6e (diff) | |
| download | tinycc-c4d0498b3ae3483fa7726500bd03e1f411289fff.tar.gz tinycc-c4d0498b3ae3483fa7726500bd03e1f411289fff.tar.bz2 | |
x86-64: Add support for new psABI relocations
R_X86_64_GOTPCRELX and R_X86_64_REX_GOTPCRELX can occur in object files
comiled by new binutils. They are not dynamic relocations, so normally
wouldn't be a problem for tcc (one doesn't normally mix object files
created by different compiler/binutils, static archives are so out :)).
If it weren't for the glibc startup code, crt*.o, of course. They now
do contain such relocs --> boom. Handle them in the trivial way.
Diffstat (limited to 'tccelf.c')
| -rw-r--r-- | tccelf.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -941,6 +941,8 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s) write64le(ptr, val - rel->r_addend); break; case R_X86_64_GOTPCREL: + case 41 /* R_X86_64_GOTPCRELX */: + case 42 /* R_X86_64_REX_GOTPCRELX */: write32le(ptr, read32le(ptr) + (s1->got->sh_addr - addr + s1->sym_attrs[sym_index].got_offset - 4)); @@ -1422,6 +1424,8 @@ ST_FUNC void build_got_entries(TCCState *s1) case R_X86_64_GOT32: case R_X86_64_GOTTPOFF: case R_X86_64_GOTPCREL: + case 41 /* R_X86_64_GOTPCRELX */: + case 42 /* R_X86_64_REX_GOTPCRELX */: case R_X86_64_PLT32: sym_index = ELFW(R_SYM)(rel->r_info); sym = &((ElfW(Sym) *)symtab_section->data)[sym_index]; @@ -1437,13 +1441,13 @@ ST_FUNC void build_got_entries(TCCState *s1) sym = &((ElfW(Sym) *)symtab_section->data)[sym_index]; } if (type == R_X86_64_GOT32 || type == R_X86_64_GOTPCREL || - type == R_X86_64_PLT32) { + type == R_X86_64_PLT32 || type == 41 || type == 42) { unsigned long ofs; /* look at the symbol got offset. If none, then add one */ - if (type == R_X86_64_GOT32 || type == R_X86_64_GOTPCREL) + if (type == R_X86_64_PLT32) + reloc_type = R_X86_64_JUMP_SLOT; + else reloc_type = R_X86_64_GLOB_DAT; - else - reloc_type = R_X86_64_JUMP_SLOT; ofs = put_got_entry(s1, reloc_type, sym->st_size, sym->st_info, sym_index); if (type == R_X86_64_PLT32) @@ -1769,6 +1773,8 @@ ST_FUNC void fill_got(TCCState *s1) switch (ELFW(R_TYPE) (rel->r_info)) { case R_X86_64_GOT32: case R_X86_64_GOTPCREL: + case 41 /* R_X86_64_GOTPCRELX */: + case 42 /* R_X86_64_REX_GOTPCRELX */: case R_X86_64_PLT32: fill_got_entry(s1, rel); break; |