Merge branch 'master' into v2.1

2013-05-25 10:20:46 +02:00
parent 992f7d4b71 5a261dd92c
commit 26e4287e60
3 changed files with 23 additions and 13 deletions
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -5659,7 +5659,11 @@ static void emit_asm_debug(BuildCtx *ctx)
 	".LEFDE1:\n\n", (int)ctx->codesz - fcofs);
 #endif
 #if (defined(__sun__) && defined(__svr4__))
+#if LJ_64
+    fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@unwind\n");
+#else
    fprintf(ctx->fp, "\t.section .eh_frame,\"aw\",@progbits\n");
+#endif
 #else
    fprintf(ctx->fp, "\t.section .eh_frame,\"a\",@progbits\n");
 #endif