ARM: Catch C++ exceptions in interpreter frames.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/buildvm_asm.c b/src/buildvm_asm.c
index 6468912c..35f413b9 100644
--- a/src/buildvm_asm.c
+++ b/src/buildvm_asm.c
@@ -191,6 +191,14 @@ void emit_asm(BuildCtx *ctx)
   if (ctx->mode != BUILD_machasm)
     fprintf(ctx->fp, ".Lbegin:\n");
 
+#if LJ_TARGET_ARM && defined(__GNUC__)
+  /* This should really be moved into buildvm_arm.dasc. */
+  fprintf(ctx->fp,
+          ".fnstart\n"
+          ".save {r4, r5, r6, r7, r8, r9, r10, r11, lr}\n"
+          ".pad #28\n");
+#endif
+
   for (i = rel = 0; i < ctx->nsym; i++) {
     int32_t ofs = ctx->sym[i].ofs;
     int32_t next = ctx->sym[i+1].ofs;
@@ -219,6 +227,13 @@ void emit_asm(BuildCtx *ctx)
 #endif
   }
 
+#if LJ_TARGET_ARM && defined(__GNUC__)
+  fprintf(ctx->fp,
+          ".globl lj_err_unwind_arm\n"
+          ".personality lj_err_unwind_arm\n"
+          ".fnend\n");
+#endif
+
   fprintf(ctx->fp, "\n");
   switch (ctx->mode) {
   case BUILD_elfasm: