diff options
| author | Thomas Stalder <git@netsolux.ch> | 2016-11-13 11:52:28 +0100 |
|---|---|---|
| committer | Thomas Stalder <git@netsolux.ch> | 2016-11-13 11:52:28 +0100 |
| commit | 47fd807f9b62945600cb15409c46cc70d3b1fa97 (patch) | |
| tree | 9ab5789f176ace516817b78370c339517fbb8404 | |
| parent | 4af25aed928491158d18b9f3209388f61007fffd (diff) | |
| download | tinycc-47fd807f9b62945600cb15409c46cc70d3b1fa97.tar.gz tinycc-47fd807f9b62945600cb15409c46cc70d3b1fa97.tar.bz2 | |
arm: Fix relocate_section with TCC_OUTPUT_MEMORY
| -rw-r--r-- | tccelf.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -791,7 +791,8 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s) { int x, is_thumb, is_call, h, blx_avail, is_bl, th_ko; x = (*(int *) ptr) & 0xffffff; - if (sym->st_shndx == SHN_UNDEF) + if (sym->st_shndx == SHN_UNDEF + || s1->output_type == TCC_OUTPUT_MEMORY) val = s1->plt->sh_addr; #ifdef DEBUG_RELOC printf ("reloc %d: x=0x%x val=0x%x ", type, x, val); @@ -1541,7 +1542,8 @@ ST_FUNC void build_got_entries(TCCState *s1) sym_index = ELFW(R_SYM)(rel->r_info); sym = &((ElfW(Sym) *)symtab_section->data)[sym_index]; if (type != R_ARM_GOTOFF && type != R_ARM_GOTPC - && sym->st_shndx == SHN_UNDEF) { + && (sym->st_shndx == SHN_UNDEF + || s1->output_type == TCC_OUTPUT_MEMORY)) { unsigned long ofs; /* look at the symbol got offset. If none, then add one */ if (type == R_ARM_GOT32) |