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

i386: Add support for new psABI relocation

Browse source 
R_386_GOT32X can occur in object files assembled by new binutils, and in
particular do appear in glibc startup code (crt*.o). This patch is
modeled after the x86_64 one, handling the new relocation in the same
trivial way.
This commit is contained in:
Thomas Preud'homme 2015-12-27 12:09:45 +08:00
parent f15c0a9333
commit 933c2235e5
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
elf.h
View file

@ -1246,8 +1246,9 @@ typedef struct
argument, returning the TLS
offset for the symbol. */
#define R_386_IRELATIVE 42 /* Adjust indirectly by program base */
#define R_386_GOT32X 43 /* 32 bit GOT entry, relaxable */
/* Keep this the last entry. */
#define R_386_NUM 43
#define R_386_NUM 44
/* SUN SPARC specific definitions. */

11
tccelf.c
View file

@ -557,6 +557,7 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
write32le(ptr, read32le(ptr) + val - s1->got->sh_addr);
break;
case R_386_GOT32:
case R_386_GOT32X:
/* we load the got offset */
write32le(ptr, read32le(ptr) + s1->sym_attrs[sym_index].got_offset);
break;
@ -572,6 +573,10 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
goto output_file;
write16le(ptr, read16le(ptr) + val - addr);
break;
default:
fprintf(stderr,"FIXME: handle reloc type %d at %x [%p] to %x\n",
type, (unsigned)addr, ptr, (unsigned)val);
break;
#elif defined(TCC_TARGET_ARM)
case R_ARM_PC24:
case R_ARM_CALL:
@ -1285,16 +1290,18 @@ ST_FUNC void build_got_entries(TCCState *s1)
switch(type) {
#if defined(TCC_TARGET_I386)
case R_386_GOT32:
case R_386_GOT32X:
case R_386_GOTOFF:
case R_386_GOTPC:
case R_386_PLT32:
if (!s1->got)
build_got(s1);
if (type == R_386_GOT32 || type == R_386_PLT32) {
if (type == R_386_GOT32 || type == R_386_GOT32X ||
type == R_386_PLT32) {
sym_index = ELFW(R_SYM)(rel->r_info);
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
/* look at the symbol got offset. If none, then add one */
if (type == R_386_GOT32)
if (type == R_386_GOT32 || type == R_386_GOT32X)
reloc_type = R_386_GLOB_DAT;
else
reloc_type = R_386_JMP_SLOT;