diff options
| author | Mike Pall <mike> | 2015-06-09 22:09:11 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-06-09 22:09:11 +0200 |
| commit | fb19df9fd765ce7384e2e28cec78b3c30a10d5ee (patch) | |
| tree | a3e6b0811cf37b6eb7fc720fc56e7e1c8222b06c /src/lj_err.c | |
| parent | 4da1bb66cdd20e868dae42d2c544280ec1b9fa76 (diff) | |
| parent | 72347895edbdc8730c1e758bfee4264fd60164ac (diff) | |
| download | luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.gz luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.bz2 luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.zip | |
Merge branch 'master' into v2.1
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 26210f54..2e20c2c0 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -58,10 +58,10 @@ | |||
| 58 | ** EXT cannot be enabled on WIN32 since system exceptions use code-driven SEH. | 58 | ** EXT cannot be enabled on WIN32 since system exceptions use code-driven SEH. |
| 59 | ** EXT is mandatory on WIN64 since the calling convention has an abundance | 59 | ** EXT is mandatory on WIN64 since the calling convention has an abundance |
| 60 | ** of callee-saved registers (rbx, rbp, rsi, rdi, r12-r15, xmm6-xmm15). | 60 | ** of callee-saved registers (rbx, rbp, rsi, rdi, r12-r15, xmm6-xmm15). |
| 61 | ** EXT is mandatory on POSIX/x64 since the interpreter doesn't save r12/r13. | 61 | ** The POSIX/x64 interpreter only saves r12/r13 for INT (e.g. PS4). |
| 62 | */ | 62 | */ |
| 63 | 63 | ||
| 64 | #if defined(__GNUC__) && (LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL)) | 64 | #if defined(__GNUC__) && (LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL)) && !LJ_NO_UNWIND |
| 65 | #define LJ_UNWIND_EXT 1 | 65 | #define LJ_UNWIND_EXT 1 |
| 66 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS | 66 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS |
| 67 | #define LJ_UNWIND_EXT 1 | 67 | #define LJ_UNWIND_EXT 1 |