diff options
| author | Mike Pall <mike> | 2014-04-27 00:10:34 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-04-27 00:10:34 +0200 |
| commit | e26dc8a21556078ad82afb33c452ea72e7c6d9f2 (patch) | |
| tree | 446096c4a50e9b023c567464a1c2bb2aa285fdae /src/host | |
| parent | c8d1aff0bafcbfadb4a119685708c19788158cd6 (diff) | |
| parent | 7a39be0ac45d8cd19c13bab38d4dda31ea599760 (diff) | |
| download | luajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.tar.gz luajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.tar.bz2 luajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/buildvm_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/host/buildvm_asm.c b/src/host/buildvm_asm.c index 9b28b3b3..079e9a80 100644 --- a/src/host/buildvm_asm.c +++ b/src/host/buildvm_asm.c | |||
| @@ -286,7 +286,7 @@ void emit_asm(BuildCtx *ctx) | |||
| 286 | fprintf(ctx->fp, "\n"); | 286 | fprintf(ctx->fp, "\n"); |
| 287 | switch (ctx->mode) { | 287 | switch (ctx->mode) { |
| 288 | case BUILD_elfasm: | 288 | case BUILD_elfasm: |
| 289 | #if !LJ_TARGET_PS3 | 289 | #if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA) |
| 290 | fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX "progbits\n"); | 290 | fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX "progbits\n"); |
| 291 | #endif | 291 | #endif |
| 292 | #if LJ_TARGET_PPCSPE | 292 | #if LJ_TARGET_PPCSPE |