ARM64: Compatibility fixes for Clang.

2 files changed, 14 insertions, 2 deletions

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 202fc5cb..cb583554 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -300,6 +300,16 @@
 #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2)
 #error "Need at least GCC 4.2 or newer"
 #endif
+#elif LJ_TARGET_ARM64
+#if __clang__
+#if (__clang_major__ < 3) || ((__clang_major__ == 3) && __clang_minor__ < 5)
+#error "Need at least Clang 3.5 or newer"
+#endif
+#else
+#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 8)
+#error "Need at least GCC 4.8 or newer"
+#endif
+#endif
 #elif !LJ_TARGET_PS3
 #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
 #error "Need at least GCC 4.3 or newer"
diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc
index d23cac20..5ba52b4d 100644
--- a/src/vm_arm64.dasc
+++ b/src/vm_arm64.dasc
@@ -3594,7 +3594,8 @@ static void emit_asm_debug(BuildCtx *ctx)
     for (i = 19; i <= 28; i++)  /* offset x19-x28 */
       fprintf(ctx->fp, "\t.byte 0x%x\n\t.uleb128 %d\n", 0x80+i, cf-i+17);
     for (i = 8; i <= 15; i++)  /* offset d8-d15 */
-      fprintf(ctx->fp, "\t.byte 5\n\t.uleb128 0x%x, %d\n", 64+i, cf-i-4);
+      fprintf(ctx->fp, "\t.byte 5\n\t.uleb128 0x%x\n\t.uleb128 %d\n",
+              64+i, cf-i-4);
     fprintf(ctx->fp,
         "\t.align 3\n"
         ".LEFDE0:\n\n");
@@ -3634,7 +3635,8 @@ static void emit_asm_debug(BuildCtx *ctx)
     for (i = 19; i <= 28; i++)  /* offset x19-x28 */
       fprintf(ctx->fp, "\t.byte 0x%x\n\t.uleb128 %d\n", 0x80+i, cf-i+17);
     for (i = 8; i <= 15; i++)  /* offset d8-d15 */
-      fprintf(ctx->fp, "\t.byte 5\n\t.uleb128 0x%x, %d\n", 64+i, cf-i-4);
+      fprintf(ctx->fp, "\t.byte 5\n\t.uleb128 0x%x\n\t.uleb128 %d\n",
+              64+i, cf-i-4);
     fprintf(ctx->fp,
         "\t.align 3\n"
         ".LEFDE2:\n\n");