diff options
| author | Mike Pall <mike> | 2015-09-20 19:18:31 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-09-20 19:18:31 +0200 |
| commit | 49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c (patch) | |
| tree | 2e3482d7b82fedb861d219fc51607d3c9ca63c9d /src/lj_arch.h | |
| parent | 55c3b29f7b20f3801848e0ab71e9de1d22207b95 (diff) | |
| parent | 076d625dc6046c5f05d55a95d3b9afd5637d5a5a (diff) | |
| download | luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.tar.gz luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.tar.bz2 luajit-49427dfcc2bb9ac60cd6023a59b0f788fcd38c3c.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
| -rw-r--r-- | src/lj_arch.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index f1e7d7f4..b72dbcca 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -155,7 +155,11 @@ | |||
| 155 | #define LJ_ARCH_NAME "x64" | 155 | #define LJ_ARCH_NAME "x64" |
| 156 | #define LJ_ARCH_BITS 64 | 156 | #define LJ_ARCH_BITS 64 |
| 157 | #define LJ_ARCH_ENDIAN LUAJIT_LE | 157 | #define LJ_ARCH_ENDIAN LUAJIT_LE |
| 158 | #define LJ_ABI_WIN LJ_TARGET_WINDOWS | 158 | #if LJ_TARGET_WINDOWS || __CYGWIN__ |
| 159 | #define LJ_ABI_WIN 1 | ||
| 160 | #else | ||
| 161 | #define LJ_ABI_WIN 0 | ||
| 162 | #endif | ||
| 159 | #define LJ_TARGET_X64 1 | 163 | #define LJ_TARGET_X64 1 |
| 160 | #define LJ_TARGET_X86ORX64 1 | 164 | #define LJ_TARGET_X86ORX64 1 |
| 161 | #define LJ_TARGET_EHRETREG 0 | 165 | #define LJ_TARGET_EHRETREG 0 |