diff options
| author | Mike Pall <mike> | 2018-06-05 11:39:10 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2018-06-05 11:39:10 +0200 |
| commit | d36afcfea57c29fb51060c24679f3b2c07806545 (patch) | |
| tree | cf96f97356f10d6b1007650f6ee5750c3cef479e | |
| parent | b708297aba2b07648bddd16867e44efc9d72666b (diff) | |
| parent | b025b01c5b9d23f6218c7d72b7aafa3f1ab1e08a (diff) | |
| download | luajit-d36afcfea57c29fb51060c24679f3b2c07806545.tar.gz luajit-d36afcfea57c29fb51060c24679f3b2c07806545.tar.bz2 luajit-d36afcfea57c29fb51060c24679f3b2c07806545.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_arch.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index fcebd84b..e796912e 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -436,12 +436,9 @@ | |||
| 436 | #error "No support for ILP32 model on ARM64" | 436 | #error "No support for ILP32 model on ARM64" |
| 437 | #endif | 437 | #endif |
| 438 | #elif LJ_TARGET_PPC | 438 | #elif LJ_TARGET_PPC |
| 439 | #if !LJ_ARCH_PPC64 && LJ_ARCH_ENDIAN == LUAJIT_LE | 439 | #if !LJ_ARCH_PPC64 && (defined(_LITTLE_ENDIAN) && (!defined(_BYTE_ORDER) || (_BYTE_ORDER == _LITTLE_ENDIAN))) |
| 440 | #error "No support for little-endian PPC32" | 440 | #error "No support for little-endian PPC32" |
| 441 | #endif | 441 | #endif |
| 442 | #if LJ_ARCH_PPC64 | ||
| 443 | #error "No support for PowerPC 64 bit mode (yet)" | ||
| 444 | #endif | ||
| 445 | #if defined(__NO_FPRS__) && !defined(_SOFT_FLOAT) | 442 | #if defined(__NO_FPRS__) && !defined(_SOFT_FLOAT) |
| 446 | #error "No support for PPC/e500 anymore (use LuaJIT 2.0)" | 443 | #error "No support for PPC/e500 anymore (use LuaJIT 2.0)" |
| 447 | #endif | 444 | #endif |