diff options
| author | Mike Pall <mike> | 2011-09-08 15:34:53 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-09-08 15:34:53 +0200 |
| commit | 1c5fbd4c1d013a9ea96cec5ef79fcc16e8041f46 (patch) | |
| tree | 34d91157baf24d6b9b793c050912fee148fd70ba | |
| parent | c56ae9f6efe074e6461e551440a410f97fe9b979 (diff) | |
| download | luajit-1c5fbd4c1d013a9ea96cec5ef79fcc16e8041f46.tar.gz luajit-1c5fbd4c1d013a9ea96cec5ef79fcc16e8041f46.tar.bz2 luajit-1c5fbd4c1d013a9ea96cec5ef79fcc16e8041f46.zip | |
ARM: Disable CPU detection for interpreter-only builds.
| -rw-r--r-- | src/lib_jit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib_jit.c b/src/lib_jit.c index 9b28520d..bfafa724 100644 --- a/src/lib_jit.c +++ b/src/lib_jit.c | |||
| @@ -577,6 +577,7 @@ static uint32_t jit_cpudetect(lua_State *L) | |||
| 577 | #endif | 577 | #endif |
| 578 | #endif | 578 | #endif |
| 579 | #elif LJ_TARGET_ARM | 579 | #elif LJ_TARGET_ARM |
| 580 | #if LJ_HASJIT | ||
| 580 | /* Compile-time ARM CPU detection. */ | 581 | /* Compile-time ARM CPU detection. */ |
| 581 | #if __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ | 582 | #if __ARM_ARCH_7__ || __ARM_ARCH_7A__ || __ARM_ARCH_7R__ |
| 582 | flags |= JIT_F_ARMV6|JIT_F_ARMV6T2|JIT_F_ARMV7; | 583 | flags |= JIT_F_ARMV6|JIT_F_ARMV6T2|JIT_F_ARMV7; |
| @@ -598,6 +599,7 @@ static uint32_t jit_cpudetect(lua_State *L) | |||
| 598 | } | 599 | } |
| 599 | } | 600 | } |
| 600 | #endif | 601 | #endif |
| 602 | #endif | ||
| 601 | #elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE | 603 | #elif LJ_TARGET_PPC || LJ_TARGET_PPCSPE |
| 602 | /* Nothing to do. */ | 604 | /* Nothing to do. */ |
| 603 | #else | 605 | #else |