check jit support for luajit

31 files changed, 15 insertions, 3 deletions

diff --git a/core/src/luajit/src/autogen/linux/i386/lj_bcdef.h b/core/src/luajit/src/autogen/linux/jit/i386/lj_bcdef.h
index c9ece5bd3..c9ece5bd3 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_bcdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_bcdef.h
diff --git a/core/src/luajit/src/autogen/linux/i386/lj_ffdef.h b/core/src/luajit/src/autogen/linux/jit/i386/lj_ffdef.h
index 29dd4d3ed..29dd4d3ed 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_ffdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_ffdef.h
diff --git a/core/src/luajit/src/autogen/linux/i386/lj_folddef.h b/core/src/luajit/src/autogen/linux/jit/i386/lj_folddef.h
index c4ec4efd5..c4ec4efd5 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_folddef.h
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_folddef.h
diff --git a/core/src/luajit/src/autogen/linux/i386/lj_libdef.h b/core/src/luajit/src/autogen/linux/jit/i386/lj_libdef.h
index 5693a5813..5693a5813 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_libdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_libdef.h
diff --git a/core/src/luajit/src/autogen/linux/i386/lj_recdef.h b/core/src/luajit/src/autogen/linux/jit/i386/lj_recdef.h
index 2c3c9be63..2c3c9be63 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_recdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_recdef.h
diff --git a/core/src/luajit/src/autogen/linux/i386/lj_vm.s b/core/src/luajit/src/autogen/linux/jit/i386/lj_vm.s
index 22a733ff6..22a733ff6 100644
--- a/core/src/luajit/src/autogen/linux/i386/lj_vm.s
+++ b/core/src/luajit/src/autogen/linux/jit/i386/lj_vm.s
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_bcdef.h b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_bcdef.h
index 231ed3a4e..231ed3a4e 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_bcdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_bcdef.h
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_ffdef.h b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_ffdef.h
index 29dd4d3ed..29dd4d3ed 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_ffdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_ffdef.h
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_folddef.h b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_folddef.h
index c4ec4efd5..c4ec4efd5 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_folddef.h
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_folddef.h
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_libdef.h b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_libdef.h
index 5693a5813..5693a5813 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_libdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_libdef.h
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_recdef.h b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_recdef.h
index 2c3c9be63..2c3c9be63 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_recdef.h
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_recdef.h
diff --git a/core/src/luajit/src/autogen/linux/x86_64/lj_vm.s b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_vm.s
index bac82f15c..bac82f15c 100644
--- a/core/src/luajit/src/autogen/linux/x86_64/lj_vm.s
+++ b/core/src/luajit/src/autogen/linux/jit/x86_64/lj_vm.s
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_bcdef.h b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_bcdef.h
index 231ed3a4e..231ed3a4e 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_bcdef.h
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_bcdef.h
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_ffdef.h b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_ffdef.h
index 29dd4d3ed..29dd4d3ed 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_ffdef.h
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_ffdef.h
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_folddef.h b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_folddef.h
index c4ec4efd5..c4ec4efd5 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_folddef.h
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_folddef.h
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_libdef.h b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_libdef.h
index 5693a5813..5693a5813 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_libdef.h
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_libdef.h
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_recdef.h b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_recdef.h
index 2c3c9be63..2c3c9be63 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_recdef.h
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_recdef.h
diff --git a/core/src/luajit/src/autogen/macosx/x86_64/lj_vm.s b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_vm.s
index 9296de458..9296de458 100644
--- a/core/src/luajit/src/autogen/macosx/x86_64/lj_vm.s
+++ b/core/src/luajit/src/autogen/macosx/jit/x86_64/lj_vm.s
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_bcdef.h b/core/src/luajit/src/autogen/windows/jit/x64/lj_bcdef.h
index ecb020640..ecb020640 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_bcdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_bcdef.h
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_ffdef.h b/core/src/luajit/src/autogen/windows/jit/x64/lj_ffdef.h
index 3c6abe2ec..3c6abe2ec 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_ffdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_ffdef.h
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_folddef.h b/core/src/luajit/src/autogen/windows/jit/x64/lj_folddef.h
index ebda3b1fd..ebda3b1fd 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_folddef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_folddef.h
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_libdef.h b/core/src/luajit/src/autogen/windows/jit/x64/lj_libdef.h
index c52f8741a..c52f8741a 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_libdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_libdef.h
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_recdef.h b/core/src/luajit/src/autogen/windows/jit/x64/lj_recdef.h
index d421265c9..d421265c9 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_recdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_recdef.h
diff --git a/core/src/luajit/src/autogen/windows/x64/lj_vm.obj b/core/src/luajit/src/autogen/windows/jit/x64/lj_vm.obj
index c18adf291..c18adf291 100644
--- a/core/src/luajit/src/autogen/windows/x64/lj_vm.obj
+++ b/core/src/luajit/src/autogen/windows/jit/x64/lj_vm.obj
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_bcdef.h b/core/src/luajit/src/autogen/windows/jit/x86/lj_bcdef.h
index dd2194886..dd2194886 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_bcdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_bcdef.h
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_ffdef.h b/core/src/luajit/src/autogen/windows/jit/x86/lj_ffdef.h
index 3c6abe2ec..3c6abe2ec 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_ffdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_ffdef.h
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_folddef.h b/core/src/luajit/src/autogen/windows/jit/x86/lj_folddef.h
index ebda3b1fd..ebda3b1fd 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_folddef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_folddef.h
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_libdef.h b/core/src/luajit/src/autogen/windows/jit/x86/lj_libdef.h
index c52f8741a..c52f8741a 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_libdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_libdef.h
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_recdef.h b/core/src/luajit/src/autogen/windows/jit/x86/lj_recdef.h
index d421265c9..d421265c9 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_recdef.h
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_recdef.h
diff --git a/core/src/luajit/src/autogen/windows/x86/lj_vm.obj b/core/src/luajit/src/autogen/windows/jit/x86/lj_vm.obj
index 8e7999911..8e7999911 100644
--- a/core/src/luajit/src/autogen/windows/x86/lj_vm.obj
+++ b/core/src/luajit/src/autogen/windows/jit/x86/lj_vm.obj
diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua
index 1359b6d2d..a9b140959 100644
--- a/core/src/luajit/xmake.lua
+++ b/core/src/luajit/xmake.lua
@@ -1,3 +1,11 @@
+-- disable jit compiler for redhat and centos
+local jit = true
+local autogendir = "src/autogen/$(plat)/jit/$(arch)"
+if os.isfile("/etc/redhat-release") then
+    jit = false
+    autogendir = "src/autogen/$(plat)/nojit/$(arch)"
+end
+
 -- add target
 target("luajit")
 
@@ -20,15 +28,19 @@ target("luajit")
     set_headerdir("$(buildir)/luajit")
 
     -- add include directories
-    add_includedirs("src", "src/autogen/$(plat)/$(arch)")
+    add_includedirs("src", autogendir)
 
     -- add the common source files
     add_files("src/*.c|ljamalg.c|luajit.c") 
     if is_plat("windows") then
-        add_files("src/autogen/$(plat)/$(arch)/lj_vm.obj")
+        add_files(autogendir .. "/lj_vm.obj")
     else
-        add_files("src/autogen/$(plat)/$(arch)/*.s")
+        add_files(autogendir .. "/*.s")
     end
 
+    -- disable jit compiler?
+    if not jit then
+        add_defines("LUAJIT_DISABLE_JIT")
+    end