From: Mike Pall <mike>
Date: Wed, 17 Oct 2012 12:22:26 +0000 (+0200)
Subject: Fix Android/x86 build.
X-Git-Tag: v2.0.0-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e32cc2a0dcaa9ae080dfa2e687f2146606a5c9ba;p=thirdparty%2FLuaJIT.git

Fix Android/x86 build.
---

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 6811e1b3..25c2cff8 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -395,7 +395,7 @@
 #endif
 
 /* Various workarounds for embedded operating systems. */
-#if defined(__ANDROID__) || defined(__symbian__)
+#if (defined(__ANDROID__) && !defined(LJ_TARGET_X86ORX64)) || defined(__symbian__)
 #define LUAJIT_NO_LOG2
 #endif
 #if defined(__symbian__)