Update to latest luajit v2.1 git version

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

luajit-2.1-fedora.patch

@@ -1,4 +1,4 @@
-From 86a1a5033a3eb07e694f8e7f7024550928191024 Mon Sep 17 00:00:00 2001
+From d5b06e912851816bed265905f4d86d82b78f26ab Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Thu, 21 Oct 2021 11:04:58 +0200
 Subject: [PATCH 01/10] Merge in LuaJIT-test-cleanup into the main repo
@@ -530,10 +530,10 @@ index 00000000..a1c9209b
 +Vlad Krasnov
 +William Adams
 diff --git a/Makefile b/Makefile
-index aa1b84bd..cb2b3418 100644
+index b0288b4d..b3c88f23 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -106,14 +106,14 @@ endif
+@@ -110,14 +110,14 @@ endif
  
  ##############################################################################
  
@@ -551,7 +551,7 @@ index aa1b84bd..cb2b3418 100644
  	@echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ===="
  	$(MKDIR) $(INSTALL_DIRS)
  	cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
-@@ -152,6 +152,17 @@ uninstall:
+@@ -156,6 +156,17 @@ uninstall:
  	$(RMDIR) $(UNINSTALL_DIRS) || :
  	@echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
  
@@ -569,7 +569,7 @@ index aa1b84bd..cb2b3418 100644
  ##############################################################################
  
  amalg:
-@@ -161,6 +172,6 @@ amalg:
+@@ -165,6 +176,6 @@ amalg:
  clean:
  	$(MAKE) -C src clean
  
@@ -188575,10 +188575,10 @@ index 00000000..ef4de129
 +-- Pointless: deg, rad, min, max, pow
 +-- LATER: %, fmod, frexp, ldexp, modf, sinh, cosh, tanh
 -- 
-2.31.1
+2.37.1
 
 
-From 6508eeb5c841344e3f128267a04e8150dd36f926 Mon Sep 17 00:00:00 2001
+From 78914a298dbadaa30613df89d94b8dddb1b64d03 Mon Sep 17 00:00:00 2001
 From: Sameera Deshpande <sameera.deshpande@linaro.org>
 Date: Fri, 15 Feb 2019 07:46:16 +0530
 Subject: [PATCH 02/10] Add support for FNMADD and FNMSUB.
@@ -188588,7 +188588,7 @@ Subject: [PATCH 02/10] Add support for FNMADD and FNMSUB.
  1 file changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
-index 67c53ee2..0e913fa5 100644
+index 1f44d023..dd3d1408 100644
 --- a/src/lj_asm_arm64.h
 +++ b/src/lj_asm_arm64.h
 @@ -353,6 +353,35 @@ static int asm_fusemadd(ASMState *as, IRIns *ir, A64Ins ai, A64Ins air)
@@ -188638,10 +188638,10 @@ index 67c53ee2..0e913fa5 100644
    }
    asm_intneg(as, ir);
 -- 
-2.31.1
+2.37.1
 
 
-From aa0b2a0c837af307d26468fce05a7c24ab6045d3 Mon Sep 17 00:00:00 2001
+From 84e0677c95af42b1ccfa6f55a572880d93854026 Mon Sep 17 00:00:00 2001
 From: Vivien HENRIET <bubuabu@bubuabu.org>
 Date: Wed, 30 Jan 2019 23:44:51 +0100
 Subject: [PATCH 03/10] Fix os.date() for timezone change awareness
@@ -188663,7 +188663,7 @@ To fix the issue tzset is called before localtime_r.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/lib_os.c b/src/lib_os.c
-index f19b831c..609cb2ec 100644
+index 6bcd0147..4b4e1503 100644
 --- a/src/lib_os.c
 +++ b/src/lib_os.c
 @@ -185,6 +185,7 @@ LJLIB_CF(os_date)
@@ -188675,10 +188675,10 @@ index f19b831c..609cb2ec 100644
  #else
      stm = localtime(&t);
 -- 
-2.31.1
+2.37.1
 
 
-From a62dc6306c4e5a4b672040067c169143da804a4f Mon Sep 17 00:00:00 2001
+From c874fa39e227ce3a8f33820b7d5046779b690fb4 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Thu, 14 Mar 2019 23:08:24 +0530
 Subject: [PATCH 04/10] Revert "FFI: Make FP to U64 conversions match JIT
@@ -188700,10 +188700,10 @@ making things worse.  There needs to be a better fix for this.
  1 file changed, 5 insertions(+), 13 deletions(-)
 
 diff --git a/src/lj_obj.h b/src/lj_obj.h
-index 1a6445fc..97885683 100644
+index 67e41181..ad9dba5d 100644
 --- a/src/lj_obj.h
 +++ b/src/lj_obj.h
-@@ -995,22 +995,14 @@ static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
+@@ -996,22 +996,14 @@ static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
  
  #define lj_num2int(n)   ((int32_t)(n))
  
@@ -188732,10 +188732,10 @@ index 1a6445fc..97885683 100644
  
  static LJ_AINLINE int32_t numberVint(cTValue *o)
 -- 
-2.31.1
+2.37.1
 
 
-From fe2399a76bab67b32409fda1de82c34e8d5d7904 Mon Sep 17 00:00:00 2001
+From f452a25f4daf8c20fb09f42624881a127ee6f335 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Sun, 17 Mar 2019 11:34:04 +0530
 Subject: [PATCH 05/10] Guard against undefined behaviour when casting from
@@ -188751,10 +188751,10 @@ TODO: Do the same for JIT as well as for float to other ranges.
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/lj_obj.h b/src/lj_obj.h
-index 97885683..9878059f 100644
+index ad9dba5d..cbfa67c3 100644
 --- a/src/lj_obj.h
 +++ b/src/lj_obj.h
-@@ -997,12 +997,18 @@ static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
+@@ -998,12 +998,18 @@ static LJ_AINLINE int32_t lj_num2bit(lua_Number n)
  
  static LJ_AINLINE uint64_t lj_num2u64(lua_Number n)
  {
@@ -188775,10 +188775,10 @@ index 97885683..9878059f 100644
  
  static LJ_AINLINE int32_t numberVint(cTValue *o)
 -- 
-2.31.1
+2.37.1
 
 
-From c193115e16a138dac69f774a7f57a5b4cc7f1097 Mon Sep 17 00:00:00 2001
+From 47e6173d38bd0a20847ebce22dd67ba7a0e82f5c Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Mon, 25 Mar 2019 17:56:53 +0530
 Subject: [PATCH 06/10] Fix build erro with fnmsub fusing
@@ -188788,7 +188788,7 @@ Subject: [PATCH 06/10] Fix build erro with fnmsub fusing
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
-index 0e913fa5..4c7bf401 100644
+index dd3d1408..1061b7d0 100644
 --- a/src/lj_asm_arm64.h
 +++ b/src/lj_asm_arm64.h
 @@ -1495,7 +1495,7 @@ static void asm_mul(ASMState *as, IRIns *ir)
@@ -188801,10 +188801,10 @@ index 0e913fa5..4c7bf401 100644
      return;
    }
 -- 
-2.31.1
+2.37.1
 
 
-From b5c2492406bf07ab80e134f351c1066e8f6224f2 Mon Sep 17 00:00:00 2001
+From 9cae182f30be1bbab4defb9f1b9f848555a14522 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Thu, 28 Mar 2019 09:19:34 +0530
 Subject: [PATCH 07/10] aarch64: better float to unsigned int conversion
@@ -188826,7 +188826,7 @@ This currently works only for 64-bit conversions, 32-bit is still WIP.
  2 files changed, 23 insertions(+), 8 deletions(-)
 
 diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
-index 4c7bf401..e7e744a8 100644
+index 1061b7d0..1b0a82a8 100644
 --- a/src/lj_asm_arm64.h
 +++ b/src/lj_asm_arm64.h
 @@ -626,14 +626,28 @@ static void asm_conv(ASMState *as, IRIns *ir)
@@ -188867,7 +188867,7 @@ index 4c7bf401..e7e744a8 100644
    } else if (st >= IRT_I8 && st <= IRT_U16) { /* Extend to 32 bit integer. */
      Reg dest = ra_dest(as, ir, RSET_GPR);
 diff --git a/src/lj_target_arm64.h b/src/lj_target_arm64.h
-index 6d39ffb8..370699d9 100644
+index d45af2e4..7051e1d1 100644
 --- a/src/lj_target_arm64.h
 +++ b/src/lj_target_arm64.h
 @@ -283,6 +283,7 @@ typedef enum A64Ins {
@@ -188879,10 +188879,10 @@ index 6d39ffb8..370699d9 100644
    A64I_FCSELd = 0x1e600c00,
    A64I_FRINTMd = 0x1e654000,
 -- 
-2.31.1
+2.37.1
 
 
-From bd79b1d4596ed6780470c8d02f77b8398d80cd3a Mon Sep 17 00:00:00 2001
+From d3bd1eb4f097422e8f225af848d713faaba7a6a6 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Thu, 28 Mar 2019 10:50:23 +0530
 Subject: [PATCH 08/10] Better behaviour for float to uint32_t conversions
@@ -188900,7 +188900,7 @@ during the narrowing pass.
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/lj_cconv.c b/src/lj_cconv.c
-index 613f66e2..7e8a8b92 100644
+index 3bbfd3f1..35efe3c9 100644
 --- a/src/lj_cconv.c
 +++ b/src/lj_cconv.c
 @@ -203,7 +203,13 @@ void lj_cconv_ct_ct(CTState *cts, CType *d, CType *s,
@@ -188919,10 +188919,10 @@ index 613f66e2..7e8a8b92 100644
        if (!(dinfo & CTF_UNSIGNED))
  	*(int64_t *)dp = (int64_t)n;
 -- 
-2.31.1
+2.37.1
 
 
-From a1636c6e1879b5eeb55a51ebba796501c93614dd Mon Sep 17 00:00:00 2001
+From a745c003a562ee8392346953214951cf62bfba85 Mon Sep 17 00:00:00 2001
 From: Siddhesh Poyarekar <siddhesh@sourceware.org>
 Date: Mon, 17 Jun 2019 13:50:57 +0530
 Subject: [PATCH 09/10] test: Check for package.searchers only in compat5.2
@@ -188955,10 +188955,10 @@ index 2baacd5c..09866f6f 100644
    assert(not package.loaders)
    assert(package.searchers)
 -- 
-2.31.1
+2.37.1
 
 
-From ec04137a0873c09eef216b32f3df3b66209f47d5 Mon Sep 17 00:00:00 2001
+From e11f638adbb95f3975d4f5c0fa610cff43d9a434 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
 Date: Thu, 19 Nov 2015 16:29:02 +0200
 Subject: [PATCH 10/10] Get rid of LUAJIT_VERSION_SYM that changes ABI on every
@@ -188966,12 +188966,12 @@ Subject: [PATCH 10/10] Get rid of LUAJIT_VERSION_SYM that changes ABI on every
 
 ---
  src/lj_dispatch.c | 5 -----
- src/luajit.c      | 2 --
+ src/luajit.c      | 1 -
  src/luajit.h      | 3 ---
- 3 files changed, 10 deletions(-)
+ 3 files changed, 9 deletions(-)
 
 diff --git a/src/lj_dispatch.c b/src/lj_dispatch.c
-index 7b73d3dd..3f69d0d1 100644
+index ded382aa..62e5a15b 100644
 --- a/src/lj_dispatch.c
 +++ b/src/lj_dispatch.c
 @@ -318,11 +318,6 @@ int luaJIT_setmode(lua_State *L, int idx, int mode)
@@ -188987,20 +188987,19 @@ index 7b73d3dd..3f69d0d1 100644
  
  /* This function can be called asynchronously (e.g. during a signal). */
 diff --git a/src/luajit.c b/src/luajit.c
-index 6aed5337..a4a11cb1 100644
+index 6dd64026..9c0b5767 100644
 --- a/src/luajit.c
 +++ b/src/luajit.c
-@@ -518,8 +518,6 @@ static int pmain(lua_State *L)
+@@ -515,7 +515,6 @@ static int pmain(lua_State *L)
+   int argn;
+   int flags = 0;
    globalL = L;
-   if (argv[0] && argv[0][0]) progname = argv[0];
- 
 -  LUAJIT_VERSION_SYM();  /* Linker-enforced version check. */
--
+ 
    argn = collectargs(argv, &flags);
    if (argn < 0) {  /* Invalid args? */
-     print_usage();
 diff --git a/src/luajit.h b/src/luajit.h
-index 2ee1f908..04f6b456 100644
+index 31f1eb1f..54a40ac3 100644
 --- a/src/luajit.h
 +++ b/src/luajit.h
 @@ -73,7 +73,4 @@ LUA_API void luaJIT_profile_stop(lua_State *L);
@@ -189012,5 +189011,5 @@ index 2ee1f908..04f6b456 100644
 -
  #endif
 -- 
-2.31.1
+2.37.1
 

luajit.spec

@@ -4,7 +4,7 @@ Name:           luajit
 Version:        2.1.0
 %global apiver %(v=%{version}; echo ${v%.${v#[0-9].[0-9].}})
 %global srcver %{version}%{?rctag:-%{rctag}}
-Release:        0.23%{?rctag:%{rctag}}%{?dist}
+Release:        0.25%{?rctag:%{rctag}}%{?dist}
 Summary:        Just-In-Time Compiler for Lua
 License:        MIT
 URL:            http://luajit.org/
@@ -94,6 +94,12 @@ make check || true
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun Aug 21 2022 Andreas Schneider <asn@redhat.com> - 2.1.0-0.25beta3
+- Update to latest luajit v2.1 git version
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-0.24beta3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-0.23beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild