aboutsummaryrefslogtreecommitdiff
path: root/arm64-gen.c
diff options
context:
space:
mode:
authorEdmund Grimley Evans <Edmund.Grimley.Evans@gmail.com>2016-10-11 18:56:10 +0100
committerEdmund Grimley Evans <Edmund.Grimley.Evans@gmail.com>2016-10-11 18:56:10 +0100
commit07ca2df5889ab526ba2de383707edb12e5d79323 (patch)
tree956ea46b69c850e1920741e68f264164d26c6c18 /arm64-gen.c
parent7bd30a488acbaf7bab9276058fc5ecc6fe0382d9 (diff)
downloadtinycc-07ca2df5889ab526ba2de383707edb12e5d79323.tar.gz
tinycc-07ca2df5889ab526ba2de383707edb12e5d79323.tar.bz2
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.
Diffstat (limited to 'arm64-gen.c')
-rw-r--r--arm64-gen.c19
1 files 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