From 47fd807f9b62945600cb15409c46cc70d3b1fa97 Mon Sep 17 00:00:00 2001
From: Thomas Stalder <git@netsolux.ch>
Date: Sun, 13 Nov 2016 11:52:28 +0100
Subject: [PATCH] arm: Fix relocate_section with TCC_OUTPUT_MEMORY
---
tccelf.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tccelf.c b/tccelf.c
index 9ed2484e..6fa10dc2 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -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)