1 files changed, 6 insertions, 4 deletions
diff --git a/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def b/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def
index 4bddcd7db..2f0980ee1 100644
--- a/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def
+++ b/misc/buildroot/toolchain/nxflat/thumb2/dyncall_skeleton.def
@@ -151,21 +151,23 @@ static const char dyncall_decl_prologue[] =
 static const char dyncall_format[] =
   "\n/* Dynamic call logic for imported symbol %s */\n\n"
   "\t.global\t%s\n"
-  "\t.type\t%s, function\n\n"
+  "\t.type\t%s, function\n"
+  "\t.thumb_func\n\n"
   "%s:\n"
   "\tstmdb\tsp!,{r4, lr}\n"
   "\tldr\tr4, =__dyninfo%04d\n"
-  "\tbl\t[r4]\n"
+  "\tblx\tr4\n"
   "\tldmia\tsp!,{r4, pc}\n"
   "\t.size\t%s, .-%s\n";
 
 static const char nonreturning_dyncall_format[] =
   "\n/* Dynamic call logic for imported, non-returning symbol %s */\n\n"
   "\t.global\t%s\n"
-  "\t.type\t%s, function\n\n"
+  "\t.type\t%s, function\n"
+  "\t.thumb_func\n\n"
   "%s:\n"
   "\tldr\tr4, =__dyninfo%04d\n"
-  "\tb\t[r4]\n"
+  "\tbx\tr4\n"
   "\t.size\t%s, .-%s\n";
 
 /*******************************************************************