diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc
index dd4b7c89..c75353d9 100644
--- a/src/buildvm_arm.dasc
+++ b/src/buildvm_arm.dasc
@@ -988,8 +988,11 @@ static void build_subroutines(BuildCtx *ctx)
   |
   |//-- Base library: conversions ------------------------------------------
   |
-  |.ffunc_1 tonumber
+  |.ffunc tonumber
   |  // Only handles the number case inline (without a base argument).
+  |  ldrd CARG12, [BASE]
+  |   cmp NARGS8:RC, #8
+  |   bne ->fff_fallback
   |  checktp CARG2, LJ_TISNUM
   |  bls ->fff_restv
   |  b ->fff_fallback
diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h
index 81229181..ca94ed18 100644
--- a/src/buildvm_arm.h
+++ b/src/buildvm_arm.h
@@ -891,7 +891,7 @@ static const unsigned int build_actionlist[5777] = {
 0x0006004d,
 0xe1c900d0,
 0xe35b0008,
-0x3a000000,
+0x1a000000,
 0x00050046,
 0xe3710000,
 0x000a0000,