d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify and fix GOT32 + PLT32 reloc commit

Browse source 
Introduce a new attribute to check the existence of a PLT entry for a
given symbol has the presence of an entry for that symbol in the dynsym
section is not proof that a PLT entry exists.

This fixes commit dc8ea93b13.
This commit is contained in:
Thomas Preud'homme 2014-03-26 22:13:20 +08:00
parent bed865275d
commit aa561d7011
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tcc.h
View file

@ -522,6 +522,7 @@ typedef struct ASMOperand {
struct sym_attr { struct sym_attr {
unsigned long got_offset; unsigned long got_offset;
unsigned char has_plt_entry:1;
#ifdef TCC_TARGET_ARM #ifdef TCC_TARGET_ARM
unsigned char plt_thumb_stub:1; unsigned char plt_thumb_stub:1;
#endif #endif

5
tccelf.c
View file

@ -1042,10 +1042,9 @@ static void put_got_entry(TCCState *s1,
if (s1->dynsym) { if (s1->dynsym) {
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index]; sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
name = (char *) symtab_section->link->data + sym->st_name; name = (char *) symtab_section->link->data + sym->st_name;
if (!find_elf_sym(s1->dynsym, name)) if (s1->sym_attrs[sym_index].has_plt_entry)
need_plt_entry = 1;
else
return; return;
s1->sym_attrs[sym_index].has_plt_entry = 1;
offset = sym->st_value; offset = sym->st_value;
#if defined(TCC_TARGET_I386) || defined(TCC_TARGET_X86_64) #if defined(TCC_TARGET_I386) || defined(TCC_TARGET_X86_64)
if (need_plt_entry) { if (need_plt_entry) {