From 933c2235e5c9628aa3d80145dc6ddfa4967a9d70 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sun, 27 Dec 2015 12:09:45 +0800 Subject: [PATCH] i386: Add support for new psABI relocation 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. --- elf.h | 3 ++- tccelf.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/elf.h b/elf.h index cce2f9d..52ccf3f 100644 --- a/elf.h +++ b/elf.h @@ -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. */ diff --git a/tccelf.c b/tccelf.c index 61d852c..b90cf0f 100644 --- a/tccelf.c +++ b/tccelf.c @@ -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;