diff options
| author | Mike Pall <mike> | 2015-06-09 21:56:58 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-06-09 22:08:40 +0200 |
| commit | 72347895edbdc8730c1e758bfee4264fd60164ac (patch) | |
| tree | 0bf8807df7f58ad461da389f44c71d5fd179bec9 /src/lj_err.c | |
| parent | 69e5342eb893815b18a1ec84ba74b0e0d1cc9beb (diff) | |
| download | luajit-72347895edbdc8730c1e758bfee4264fd60164ac.tar.gz luajit-72347895edbdc8730c1e758bfee4264fd60164ac.tar.bz2 luajit-72347895edbdc8730c1e758bfee4264fd60164ac.zip | |
x64: Allow building without external unwinder.
Required for PS4 SDK 2.5. Thanks to James Park.
Diffstat (limited to 'src/lj_err.c')
| -rw-r--r-- | src/lj_err.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index 081bfde4..11b07b56 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -57,10 +57,10 @@ | |||
| 57 | ** EXT cannot be enabled on WIN32 since system exceptions use code-driven SEH. | 57 | ** EXT cannot be enabled on WIN32 since system exceptions use code-driven SEH. |
| 58 | ** EXT is mandatory on WIN64 since the calling convention has an abundance | 58 | ** EXT is mandatory on WIN64 since the calling convention has an abundance |
| 59 | ** of callee-saved registers (rbx, rbp, rsi, rdi, r12-r15, xmm6-xmm15). | 59 | ** of callee-saved registers (rbx, rbp, rsi, rdi, r12-r15, xmm6-xmm15). |
| 60 | ** EXT is mandatory on POSIX/x64 since the interpreter doesn't save r12/r13. | 60 | ** The POSIX/x64 interpreter only saves r12/r13 for INT (e.g. PS4). |
| 61 | */ | 61 | */ |
| 62 | 62 | ||
| 63 | #if defined(__GNUC__) && (LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL)) | 63 | #if defined(__GNUC__) && (LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL)) && !LJ_NO_UNWIND |
| 64 | #define LJ_UNWIND_EXT 1 | 64 | #define LJ_UNWIND_EXT 1 |
| 65 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS | 65 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS |
| 66 | #define LJ_UNWIND_EXT 1 | 66 | #define LJ_UNWIND_EXT 1 |