From 07ca2df5889ab526ba2de383707edb12e5d79323 Mon Sep 17 00:00:00 2001 From: Edmund Grimley Evans Date: Tue, 11 Oct 2016 18:56:10 +0100 Subject: [PATCH] Use R_AARCH64_MOVW_UABS_G* instead of R_AARCH64_CALL26. This is a work-around for TCC's linker, on AArch64, not building a PLT when TCC is invoked with "-run". Fixing the linker should be possible: it works on arm and x86_64, apparently. --- arm64-gen.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arm64-gen.c b/arm64-gen.c index f9f9581..5f52e1f 100644 --- a/arm64-gen.c +++ b/arm64-gen.c @@ -592,13 +592,22 @@ ST_FUNC void store(int r, SValue *sv) static void arm64_gen_bl_or_b(int b) { + // Currently TCC's linker does not generate a PLT when TCC is invoked + // with "-run". This means functions can be out of range if we try to + // call them in the usual way. Until the linker is fixed, work around + // this by using R_AARCH64_MOVW_UABS_G* relocations; see arm64_sym. + int avoid_call26 = 1; + if ((vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST) { - assert(!b); - if (vtop->r & VT_SYM) + assert(!b && (vtop->r & VT_SYM)); + if (avoid_call26) { + arm64_sym(30, vtop->sym, 0); + o(0xd63f03c0); // blr x30 + } + else { greloc(cur_text_section, vtop->sym, ind, R_AARCH64_CALL26); - else - assert(0); - o(0x94000000); // bl . + o(0x94000000); // bl . + } } else o(0xd61f0000 | (uint32_t)!b << 21 | intr(gv(RC_R30)) << 5); // br/blr