Merge branch 'master' into v2.1

2014-04-27 00:10:34 +02:00
parent c8d1aff0ba 7a39be0ac4
commit e26dc8a215
8 changed files with 158 additions and 28 deletions
--- a/src/host/buildvm_asm.c
+++ b/src/host/buildvm_asm.c
@@ -286,7 +286,7 @@ void emit_asm(BuildCtx *ctx)
  fprintf(ctx->fp, "\n");
  switch (ctx->mode) {
  case BUILD_elfasm:
-#if !LJ_TARGET_PS3
+#if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
    fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX "progbits\n");
 #endif
 #if LJ_TARGET_PPCSPE