MIPS: Fix build failures and warnings.

diff --git a/src/Makefile.dep b/src/Makefile.dep
index 1df1ce6ccaa90943be196c6f2368f83a343535d4..4ef002e92c2efcbe961da553b1e2d5d7ec44a912 100644 (file)
--- a/src/Makefile.dep
+++ b/src/Makefile.dep
@@ -162,8 +162,8 @@ lj_opt_narrow.o: lj_opt_narrow.c lj_obj.h lua.h luaconf.h lj_def.h \
 lj_opt_sink.o: lj_opt_sink.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
  lj_ir.h lj_jit.h lj_iropt.h lj_target.h lj_target_*.h
 lj_opt_split.o: lj_opt_split.c lj_obj.h lua.h luaconf.h lj_def.h \
- lj_arch.h lj_err.h lj_errmsg.h lj_buf.h lj_gc.h lj_str.h lj_dispatch.h \
- lj_bc.h lj_jit.h lj_ir.h lj_ircall.h lj_iropt.h lj_vm.h
+ lj_arch.h lj_err.h lj_errmsg.h lj_buf.h lj_gc.h lj_str.h lj_ir.h \
+ lj_jit.h lj_ircall.h lj_iropt.h lj_dispatch.h lj_bc.h lj_vm.h
 lj_parse.o: lj_parse.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
  lj_gc.h lj_err.h lj_errmsg.h lj_debug.h lj_buf.h lj_str.h lj_tab.h \
  lj_func.h lj_state.h lj_bc.h lj_ctype.h lj_strfmt.h lj_lex.h lj_parse.h \

diff --git a/src/lj_arch.h b/src/lj_arch.h
index bbcdc7394a5f9843332b1bfeead675ad12920121..cc5a0a66dba0ccc984f18911ed8e62ad723185fc 100644 (file)
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -428,11 +428,11 @@
 #error "No support for PPC/e500 anymore (use LuaJIT 2.0)"
 #endif
 #elif LJ_TARGET_MIPS32
-#if _MIPS_SIM != _MIPS_SIM_ABI32
+#if !((defined(_MIPS_SIM_ABI32) && _MIPS_SIM == _MIPS_SIM_ABI32) || (defined(_ABIO32) && _MIPS_SIM == _ABIO32))
 #error "Only o32 ABI supported for MIPS32"
 #endif
 #elif LJ_TARGET_MIPS64
-#if _MIPS_SIM != _MIPS_SIM_ABI64
+#if !((defined(_MIPS_SIM_ABI64) && _MIPS_SIM == _MIPS_SIM_ABI64) || (defined(_ABI64) && _MIPS_SIM == _ABI64))
 #error "Only n64 ABI supported for MIPS64"
 #endif
 #endif

diff --git a/src/lj_opt_split.c b/src/lj_opt_split.c
index 19818660e448c462788a1f70f94fcea700aaa4f7..884285d26b00f30e8463cee53f0e19bc2a803e90 100644 (file)
--- a/src/lj_opt_split.c
+++ b/src/lj_opt_split.c
@@ -12,11 +12,11 @@
 
 #include "lj_err.h"
 #include "lj_buf.h"
-#include "lj_dispatch.h"
 #include "lj_ir.h"
 #include "lj_jit.h"
 #include "lj_ircall.h"
 #include "lj_iropt.h"
+#include "lj_dispatch.h"
 #include "lj_vm.h"
 
 /* SPLIT pass: