From 5a4da2e59e3d4141f3e45d905d3fa5a3f305858d Mon Sep 17 00:00:00 2001 From: Xiaochen Wang Date: Fri, 21 Jun 2024 15:32:44 +0800 Subject: [PATCH] replace luajit patch with ones from kong-ee 2.8.x.x branch --- ...xed_compatibility_regression_with_Mi.patch | 19 --- ...t_Detect_SSE4.2_support_dynamically.patch} | 130 +++++++++++------- ...xed_compatibility_regression_with_Mi.patch | 30 ++++ ...4.1_str_hash_to_replace_hash_sparse.patch} | 100 +++++++++----- 4 files changed, 173 insertions(+), 106 deletions(-) delete mode 100644 build/openresty/patches/LuaJIT-2.1-20210510_06_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch rename build/openresty/patches/{LuaJIT-2.1-20210510_05_Revert_Detect_SSE4.2_support_dynamically.patch => LuaJIT-2.1-20210510_07_Revert_Detect_SSE4.2_support_dynamically.patch} (79%) create mode 100644 build/openresty/patches/LuaJIT-2.1-20210510_08_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch rename build/openresty/patches/{LuaJIT-2.1-20210510_07_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch => LuaJIT-2.1-20210510_09_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch} (90%) diff --git a/build/openresty/patches/LuaJIT-2.1-20210510_06_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch b/build/openresty/patches/LuaJIT-2.1-20210510_06_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch deleted file mode 100644 index 20eed7e7242c7..0000000000000 --- a/build/openresty/patches/LuaJIT-2.1-20210510_06_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h b/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h -index e6538953..8f6b8e1b 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h -+++ b/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h -@@ -21,11 +21,6 @@ - #undef LJ_AINLINE - #define LJ_AINLINE - --#ifdef __MINGW32__ --#define random() ((long) rand()) --#define srandom(seed) srand(seed) --#endif -- - static const uint64_t* cast_uint64p(const char* str) - { - return (const uint64_t*)(void*)str; --- -2.43.0 - diff --git a/build/openresty/patches/LuaJIT-2.1-20210510_05_Revert_Detect_SSE4.2_support_dynamically.patch b/build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Detect_SSE4.2_support_dynamically.patch similarity index 79% rename from build/openresty/patches/LuaJIT-2.1-20210510_05_Revert_Detect_SSE4.2_support_dynamically.patch rename to build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Detect_SSE4.2_support_dynamically.patch index 8f7e472b435be..bf921dc57bd1a 100644 --- a/build/openresty/patches/LuaJIT-2.1-20210510_05_Revert_Detect_SSE4.2_support_dynamically.patch +++ b/build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Detect_SSE4.2_support_dynamically.patch @@ -1,8 +1,29 @@ -diff --git a/bundle/LuaJIT-2.1-20231117/src/Makefile b/bundle/LuaJIT-2.1-20231117/src/Makefile -index f87762e..d12217a 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/Makefile -+++ b/bundle/LuaJIT-2.1-20231117/src/Makefile -@@ -527,16 +527,10 @@ LJCORE_O= lj_assert.o lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o lj_buf.o \ +From db0824835876d11bf88b0c8ad9791019ea969ef7 Mon Sep 17 00:00:00 2001 +From: Zhongwei Yao +Date: Fri, 31 May 2024 11:39:51 -0700 +Subject: [PATCH] Revert "Detect SSE4.2 support dynamically" + +This reverts commit 34b63ba83542cad8675f875c9aa849653ead378d. +--- + src/Makefile | 18 +-- + src/lj_arch.h | 4 - + src/lj_init.c | 69 ------------ + src/lj_jit.h | 1 - + src/lj_str.c | 25 ++--- + src/lj_str.h | 12 -- + src/ljamalg.c | 1 + + .../src/lj_str_hash_x64.h} | 106 +++++++----------- + src/x64/test/benchmark.cxx | 13 +-- + src/x64/test/test.cpp | 10 +- + 10 files changed, 64 insertions(+), 195 deletions(-) + delete mode 100644 src/lj_init.c + rename src/{lj_str_hash.c => x64/src/lj_str_hash_x64.h} (76%) + +diff --git a/bundle/LuaJIT-2.1-20210510/src/Makefile b/bundle/LuaJIT-2.1-20210510/src/Makefile +index 287e4cd2..9fcf9316 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/Makefile ++++ b/bundle/LuaJIT-2.1-20210510/src/Makefile +@@ -512,16 +512,10 @@ lj_ctype.o lj_cdata.o lj_cconv.o lj_ccall.o lj_ccallback.o \ lj_carith.o lj_clib.o lj_cparse.o \ lj_lib.o lj_alloc.o lib_aux.o \ @@ -21,7 +42,7 @@ index f87762e..d12217a 100644 LIB_VMDEF= jit/vmdef.lua LIB_VMDEFP= $(LIB_VMDEF) -@@ -558,7 +552,7 @@ ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) +@@ -543,7 +537,7 @@ ############################################################################## # Mixed mode defaults. @@ -30,7 +51,7 @@ index f87762e..d12217a 100644 TARGET_T= $(LUAJIT_T) $(LUAJIT_SO) TARGET_DEP= $(LIB_VMDEF) $(LUAJIT_SO) -@@ -640,7 +634,7 @@ E= @echo +@@ -625,7 +619,7 @@ default all: $(TARGET_T) amalg: @@ -39,7 +60,7 @@ index f87762e..d12217a 100644 clean: $(HOST_RM) $(ALL_RM) -@@ -722,8 +716,8 @@ lj_folddef.h: $(BUILDVM_T) lj_opt_fold.c +@@ -702,8 +696,8 @@ %.o: %.c $(E) "CC $@" @@ -50,12 +71,12 @@ index f87762e..d12217a 100644 %.o: %.S $(E) "ASM $@" -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_arch.h b/bundle/LuaJIT-2.1-20231117/src/lj_arch.h -index fbd18b3..2b3a936 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_arch.h -+++ b/bundle/LuaJIT-2.1-20231117/src/lj_arch.h -@@ -220,10 +220,6 @@ - #error "macOS requires GC64 -- don't disable it" +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_arch.h b/bundle/LuaJIT-2.1-20210510/src/lj_arch.h +index 326c7148..1ea68032 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_arch.h ++++ b/bundle/LuaJIT-2.1-20210510/src/lj_arch.h +@@ -209,10 +209,6 @@ + #define LJ_TARGET_GC64 1 #endif -#ifdef __GNUC__ @@ -65,10 +86,10 @@ index fbd18b3..2b3a936 100644 #elif LUAJIT_TARGET == LUAJIT_ARCH_ARM #define LJ_ARCH_NAME "arm" -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_init.c b/bundle/LuaJIT-2.1-20231117/src/lj_init.c +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_init.c b/bundle/LuaJIT-2.1-20210510/src/lj_init.c deleted file mode 100644 -index a6816e1..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_init.c +index a6816e1e..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_init.c +++ /dev/null @@ -1,69 +0,0 @@ -#include @@ -140,11 +161,11 @@ index a6816e1..0000000 - str_hash_init (flags); -} -#endif -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_jit.h b/bundle/LuaJIT-2.1-20231117/src/lj_jit.h -index a60a9ae..c44eaf7 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_jit.h -+++ b/bundle/LuaJIT-2.1-20231117/src/lj_jit.h -@@ -23,7 +23,6 @@ +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_jit.h b/bundle/LuaJIT-2.1-20210510/src/lj_jit.h +index 8993354f..c834d80a 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_jit.h ++++ b/bundle/LuaJIT-2.1-20210510/src/lj_jit.h +@@ -22,7 +22,6 @@ #define JIT_F_SSE3 (JIT_F_CPU << 0) #define JIT_F_SSE4_1 (JIT_F_CPU << 1) #define JIT_F_BMI2 (JIT_F_CPU << 2) @@ -152,19 +173,19 @@ index a60a9ae..c44eaf7 100644 #define JIT_F_CPUSTRING "\4SSE3\6SSE4.1\4BMI2" -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_str.c b/bundle/LuaJIT-2.1-20231117/src/lj_str.c -index 1255670..9624cdf 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_str.c -+++ b/bundle/LuaJIT-2.1-20231117/src/lj_str.c +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_str.c b/bundle/LuaJIT-2.1-20210510/src/lj_str.c +index d37f3b22..c0e2dfad 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_str.c ++++ b/bundle/LuaJIT-2.1-20210510/src/lj_str.c @@ -12,6 +12,7 @@ #include "lj_str.h" #include "lj_char.h" #include "lj_prng.h" +#include "x64/src/lj_str_hash_x64.h" - /* -- String helpers ------------------------------------------------------ */ -@@ -82,22 +83,9 @@ int lj_str_haspattern(GCstr *s) + /* -- String helpers ------------------------------------------------------ */ +@@ -83,22 +84,9 @@ int lj_str_haspattern(GCstr *s) /* -- String hashing ------------------------------------------------------ */ @@ -189,7 +210,7 @@ index 1255670..9624cdf 100644 { /* Constants taken from lookup3 hash by Bob Jenkins. */ StrHash a, b, h = len ^ (StrHash)seed; -@@ -118,11 +106,12 @@ static StrHash hash_sparse_def(uint64_t seed, const char *str, MSize len) +@@ -119,11 +107,12 @@ static StrHash hash_sparse_def(uint64_t seed, const char *str, MSize len) h ^= b; h -= lj_rol(b, 16); return h; } @@ -205,10 +226,10 @@ index 1255670..9624cdf 100644 { StrHash b = lj_bswap(lj_rol(h ^ (StrHash)(seed >> 32), 4)); if (len > 12) { -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_str.h b/bundle/LuaJIT-2.1-20231117/src/lj_str.h -index 94537b4..2a5a819 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_str.h -+++ b/bundle/LuaJIT-2.1-20231117/src/lj_str.h +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_str.h b/bundle/LuaJIT-2.1-20210510/src/lj_str.h +index f7b9234b..28edb5a5 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_str.h ++++ b/bundle/LuaJIT-2.1-20210510/src/lj_str.h @@ -28,16 +28,4 @@ LJ_FUNC void LJ_FASTCALL lj_str_init(lua_State *L); #define lj_str_newlit(L, s) (lj_str_new(L, "" s, sizeof(s)-1)) #define lj_str_size(len) (sizeof(GCstr) + (((len)+4) & ~(MSize)3)) @@ -226,22 +247,22 @@ index 94537b4..2a5a819 100644 -#endif - #endif -diff --git a/bundle/LuaJIT-2.1-20231117/src/ljamalg.c b/bundle/LuaJIT-2.1-20231117/src/ljamalg.c -index 9a5108f..f1dce6a 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/ljamalg.c -+++ b/bundle/LuaJIT-2.1-20231117/src/ljamalg.c -@@ -88,3 +88,4 @@ +diff --git a/bundle/LuaJIT-2.1-20210510/src/ljamalg.c b/bundle/LuaJIT-2.1-20210510/src/ljamalg.c +index 36ad2f6d..34922650 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/ljamalg.c ++++ b/bundle/LuaJIT-2.1-20210510/src/ljamalg.c +@@ -87,3 +87,4 @@ #include "lib_ffi.c" - #include "lib_buffer.c" + #include "lib_kprof.c" #include "lib_init.c" + -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_str_hash.c b/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_str_hash.c b/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h similarity index 76% -rename from bundle/LuaJIT-2.1-20231117/src/lj_str_hash.c -rename to bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h -index 0ee4b5f..e653895 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_str_hash.c -+++ b/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h +rename from src/lj_str_hash.c +rename to src/x64/src/lj_str_hash_x64.h +index 0ee4b5f6..e6538953 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_str_hash.c ++++ b/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h @@ -5,48 +5,23 @@ * to 128 bytes of given string. */ @@ -458,10 +479,10 @@ index 0ee4b5f..e653895 100644 +#undef ARCH_HASH_DENSE #endif +#endif /*_LJ_STR_HASH_X64_H_*/ -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx b/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx -index 1ea8fb6..ee247c1 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx -+++ b/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx b/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx +index 1ea8fb6b..ee247c1c 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx ++++ b/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx @@ -1,10 +1,7 @@ #include // for gettimeofday() extern "C" { @@ -504,10 +525,10 @@ index 1ea8fb6..ee247c1 100644 conflictWasSparse[h1 & mask]++; conflictIsSparse[h2 & mask]++; -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp b/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp -index 432c7bb..75f34e9 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp -+++ b/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp b/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp +index 432c7bbb..75f34e9f 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp ++++ b/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp @@ -4,14 +4,10 @@ #include #define LUAJIT_SECURITY_STRHASH 1 @@ -536,3 +557,6 @@ index 432c7bb..75f34e9 100644 } return true; +-- +2.43.0 + diff --git a/build/openresty/patches/LuaJIT-2.1-20210510_08_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch b/build/openresty/patches/LuaJIT-2.1-20210510_08_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch new file mode 100644 index 0000000000000..8fd8baa8796bf --- /dev/null +++ b/build/openresty/patches/LuaJIT-2.1-20210510_08_Revert_bugfix_fixed_compatibility_regression_with_Mi.patch @@ -0,0 +1,30 @@ +From 01a9e4c7b67adb9f53cee915633bb754bd9300ee Mon Sep 17 00:00:00 2001 +From: Zhongwei Yao +Date: Fri, 31 May 2024 11:40:58 -0700 +Subject: [PATCH] Revert "bugfix: fixed compatibility regression with MinGW + gcc" + +This reverts commit b882bdb6d65156249fd9119152826e2d1e0ab01c. +--- + src/x64/src/lj_str_hash_x64.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h b/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h +index e6538953..8f6b8e1b 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h ++++ b/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h +@@ -21,11 +21,6 @@ + #undef LJ_AINLINE + #define LJ_AINLINE + +-#ifdef __MINGW32__ +-#define random() ((long) rand()) +-#define srandom(seed) srand(seed) +-#endif +- + static const uint64_t* cast_uint64p(const char* str) + { + return (const uint64_t*)(void*)str; +-- +2.43.0 + diff --git a/build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch b/build/openresty/patches/LuaJIT-2.1-20210510_09_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch similarity index 90% rename from build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch rename to build/openresty/patches/LuaJIT-2.1-20210510_09_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch index 8c6138d381410..5e3f680df813a 100644 --- a/build/openresty/patches/LuaJIT-2.1-20210510_07_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch +++ b/build/openresty/patches/LuaJIT-2.1-20210510_09_Revert_Adjust_SSE4.1_str_hash_to_replace_hash_sparse.patch @@ -1,16 +1,45 @@ -diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_str.c b/bundle/LuaJIT-2.1-20231117/src/lj_str.c -index 9624cdf..e624f0b 100644 ---- a/bundle/LuaJIT-2.1-20231117/src/lj_str.c -+++ b/bundle/LuaJIT-2.1-20231117/src/lj_str.c +From 73811be9a047af819710c71cf2649603bc136cab Mon Sep 17 00:00:00 2001 +From: Zhongwei Yao +Date: Fri, 31 May 2024 11:42:17 -0700 +Subject: [PATCH] Revert "Adjust SSE4.1 str_hash to replace hash_sparse and + hash_dense" + +This reverts commit 5bccde90b1808d1d456f52ae2aa8824487045111. +--- + src/lj_str.c | 5 +- + src/x64/Makefile | 13 -- + src/x64/src/lj_str_hash_x64.h | 282 -------------------------- + src/x64/test/Makefile | 47 ----- + src/x64/test/benchmark.cxx | 357 --------------------------------- + src/x64/test/test.cpp | 77 ------- + src/x64/test/test_str_comp.lua | 67 ------- + src/x64/test/test_util.cxx | 21 -- + src/x64/test/test_util.d | 107 ---------- + src/x64/test/test_util.hpp | 57 ------ + 10 files changed, 1 insertion(+), 1032 deletions(-) + delete mode 100644 src/x64/Makefile + delete mode 100644 src/x64/src/lj_str_hash_x64.h + delete mode 100644 src/x64/test/Makefile + delete mode 100644 src/x64/test/benchmark.cxx + delete mode 100644 src/x64/test/test.cpp + delete mode 100644 src/x64/test/test_str_comp.lua + delete mode 100644 src/x64/test/test_util.cxx + delete mode 100644 src/x64/test/test_util.d + delete mode 100644 src/x64/test/test_util.hpp + +diff --git a/bundle/LuaJIT-2.1-20210510/src/lj_str.c b/bundle/LuaJIT-2.1-20210510/src/lj_str.c +index c0e2dfad..27de2c0d 100644 +--- a/bundle/LuaJIT-2.1-20210510/src/lj_str.c ++++ b/bundle/LuaJIT-2.1-20210510/src/lj_str.c @@ -12,7 +12,6 @@ #include "lj_str.h" #include "lj_char.h" #include "lj_prng.h" -#include "x64/src/lj_str_hash_x64.h" - /* -- String helpers ------------------------------------------------------ */ -@@ -83,7 +82,6 @@ int lj_str_haspattern(GCstr *s) + /* -- String helpers ------------------------------------------------------ */ +@@ -84,7 +83,6 @@ int lj_str_haspattern(GCstr *s) /* -- String hashing ------------------------------------------------------ */ @@ -18,7 +47,7 @@ index 9624cdf..e624f0b 100644 /* Keyed sparse ARX string hash. Constant time. */ static StrHash hash_sparse(uint64_t seed, const char *str, MSize len) { -@@ -106,9 +104,8 @@ static StrHash hash_sparse(uint64_t seed, const char *str, MSize len) +@@ -107,9 +105,8 @@ static StrHash hash_sparse(uint64_t seed, const char *str, MSize len) h ^= b; h -= lj_rol(b, 16); return h; } @@ -29,10 +58,10 @@ index 9624cdf..e624f0b 100644 /* Keyed dense ARX string hash. Linear time. */ static LJ_NOINLINE StrHash hash_dense(uint64_t seed, StrHash h, const char *str, MSize len) -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/Makefile b/bundle/LuaJIT-2.1-20231117/src/x64/Makefile +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/Makefile b/bundle/LuaJIT-2.1-20210510/src/x64/Makefile deleted file mode 100644 -index 2727714..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/Makefile +index 27277140..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -.PHONY: default test benchmark clean @@ -48,10 +77,10 @@ index 2727714..0000000 - -clean: - $(MAKE) -C test clean -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h b/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h b/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h deleted file mode 100644 -index 8f6b8e1..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/src/lj_str_hash_x64.h +index 8f6b8e1b..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/src/lj_str_hash_x64.h +++ /dev/null @@ -1,282 +0,0 @@ -/* @@ -336,10 +365,10 @@ index 8f6b8e1..0000000 -#undef ARCH_HASH_DENSE -#endif -#endif /*_LJ_STR_HASH_X64_H_*/ -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/Makefile b/bundle/LuaJIT-2.1-20231117/src/x64/test/Makefile +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/Makefile b/bundle/LuaJIT-2.1-20210510/src/x64/test/Makefile deleted file mode 100644 -index 4326ab3..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/Makefile +index 4326ab3d..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -.PHONY: default test benchmark @@ -389,10 +418,10 @@ index 4326ab3..0000000 - -clean: - -rm -f *.o *.d dep*.txt $(BENCHMARK_PROGRAM) $(TEST_PROGRAM) -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx b/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx b/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx deleted file mode 100644 -index ee247c1..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/benchmark.cxx +index ee247c1c..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/benchmark.cxx +++ /dev/null @@ -1,357 +0,0 @@ -#include // for gettimeofday() @@ -752,10 +781,10 @@ index ee247c1..0000000 - benchmarkHashFunc(); - return 0; -} -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp b/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp b/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp deleted file mode 100644 -index 75f34e9..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test.cpp +index 75f34e9f..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include @@ -835,10 +864,10 @@ index 75f34e9..0000000 - - return TestErrMsgMgr::noError() ? 0 : -1; -} -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_str_comp.lua b/bundle/LuaJIT-2.1-20231117/src/x64/test/test_str_comp.lua +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_str_comp.lua b/bundle/LuaJIT-2.1-20210510/src/x64/test/test_str_comp.lua deleted file mode 100644 -index 3a5c3e6..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_str_comp.lua +index 3a5c3e67..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_str_comp.lua +++ /dev/null @@ -1,67 +0,0 @@ ---[[ @@ -908,10 +937,10 @@ index 3a5c3e6..0000000 -end - -os.exit(0) -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.cxx b/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.cxx +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.cxx b/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.cxx deleted file mode 100644 -index 34b7d67..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.cxx +index 34b7d675..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.cxx +++ /dev/null @@ -1,21 +0,0 @@ -#include @@ -935,10 +964,10 @@ index 34b7d67..0000000 - fclose(devNull); - va_end (args); -} -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.d b/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.d +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.d b/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.d deleted file mode 100644 -index e539432..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.d +index e539432e..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.d +++ /dev/null @@ -1,107 +0,0 @@ -test_util.o: test_util.cxx /usr/include/stdc-predef.h \ @@ -1048,10 +1077,10 @@ index e539432..0000000 - /usr/include/c++/10/bits/stl_vector.h \ - /usr/include/c++/10/bits/stl_bvector.h \ - /usr/include/c++/10/bits/vector.tcc -diff --git a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.hpp b/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.hpp +diff --git a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.hpp b/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.hpp deleted file mode 100644 -index 6cc2ea2..0000000 ---- a/bundle/LuaJIT-2.1-20231117/src/x64/test/test_util.hpp +index 6cc2ea2c..00000000 +--- a/bundle/LuaJIT-2.1-20210510/src/x64/test/test_util.hpp +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _TEST_UTIL_HPP_ @@ -1111,3 +1140,6 @@ index 6cc2ea2..0000000 - __attribute__ ((format (printf, 1, 2))); - -#endif //_TEST_UTIL_HPP_ +-- +2.43.0 +