diff options
Diffstat (limited to 'misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def')
| -rw-r--r-- | misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def b/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def index 08faf1624..ce5ea0ad3 100644 --- a/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def +++ b/misc/buildroot/toolchain/nxflat/arm/dyncall_skeleton.def @@ -144,7 +144,7 @@ static const char dyncall_decl_prologue[] = "\t.text\n" "\t.align\t2\n"; -#define MKCALLARGS(fn, i) (fn), (fn), (fn), (fn), (i), (fn), (fn) +#define MKCALLARGS(fn, i) (fn), (fn), (fn), (fn), (i), (fn), (fn), (i), (i) static const char dyncall_format[] = "\n/* Dynamic call logic for imported symbol %s */\n\n" @@ -152,9 +152,13 @@ static const char dyncall_format[] = "\t.type\t%s, function\n\n" "%s:\n" "\tstmdb\tsp!,{r4, lr}\n" - "\tldr\tr4, =__dyninfo%04d\n" + "\tldr\tr4,.Ldyn%04d\n" + "\tldr\tr4,[sl,r4]\n" + "\tldr\tr4,[r4,#0]\n" "\tblx\tr4\n" "\tldmia\tsp!,{r4, pc}\n" + ".Ldyn%04d:\n" + "\t.word\t__dyninfo%04d(GOT)\n" "\t.size\t%s, .-%s\n"; static const char nonreturning_dyncall_format[] = @@ -162,8 +166,12 @@ static const char nonreturning_dyncall_format[] = "\t.global\t%s\n" "\t.type\t%s, function\n\n" "%s:\n" - "\tldr\tr4, =__dyninfo%04d\n" + "\tldr\tr4,.Ldyn%04d\n" + "\tldr\tr4,[sl,r4]\n" + "\tldr\tr4,[r4,#0]\n" "\tbx\tr4\n" + ".Ldyn%04d:\n" + "\t.word\t__dyninfo%04d(GOT)\n" "\t.size\t%s, .-%s\n"; /******************************************************************* |