Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1228734
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luajit?expand=0&rev=16

LuaJIT.obsinfo

@@ -0,0 +1,4 @@
+name: LuaJIT
+version: 5.1.2.1.0+git.1731601260.fe71d0f
+mtime: 1731601260
+commit: fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="manual">
+  <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://github.com/LuaJIT/LuaJIT.git</param>
     <param name="versionprefix">5.1.2.1.0+git</param>
@@ -8,7 +8,9 @@
     <param name="changesgenerate">enable</param>
     <param name="changesauthor">mcepl@cepl.eu</param>
   </service>
-  <service name="recompress" mode="manual">
+  <service name="tar" mode="buildtime">
+  </service>
+  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/LuaJIT/LuaJIT.git</param>
-              <param name="changesrevision">f725e44cda8f359869bf8f92ce71787ddca45618</param></service></servicedata>
+              <param name="changesrevision">fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059</param></service></servicedata>

luajit-lua-versioned.patch

@@ -23,7 +23,7 @@
  VERSION= $(MMVERSION).$(RELVER)
  
  ##############################################################################
-@@ -51,7 +52,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+@@ -52,7 +53,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
  INSTALL_TNAME= luajit-$(VERSION)
@@ -32,7 +32,7 @@
  INSTALL_ANAME= libluajit-$(ABIVER).a
  INSTALL_SOSHORT1= libluajit-$(ABIVER).so
  INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
-@@ -89,7 +90,7 @@ ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
+@@ -90,7 +91,7 @@ ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
    SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
  endif
  
@@ -41,7 +41,7 @@
  FILE_A= libluajit.a
  FILE_SO= libluajit.so
  FILE_MAN= luajit.1
-@@ -137,7 +138,7 @@ install: $(INSTALL_DEP)
+@@ -138,7 +139,7 @@ install: $(INSTALL_DEP)
  	  ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \
  	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
  	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :

luajit-s390x.patch

@@ -1,4 +1,4 @@
-From db9c993d2ffcf09b3995b8949bb8f5026e610857 Mon Sep 17 00:00:00 2001
+From dee73f516f0da49e930dcfa1dd61720dcb69b7dd Mon Sep 17 00:00:00 2001
 From: Ilya Leoshkevich <iii@linux.ibm.com>
 Date: Thu, 31 Aug 2023 11:18:32 +0200
 Subject: [PATCH 1/2] Add s390x architecture support to DynASM
@@ -11,7 +11,8 @@ missing pieces in the ecosystem support is LuaJIT.
 The s390x support for LuaJIT was initially developed by @ketank-new,
 @mundaym and @niravthakkar. It found its way into moonjit and luajit2
 forks, as well as Fedora distro (as a patch). There were also smaller
-contributions by @preetikhorjuvenkar, @Bisht13, @velemas and @iii-i.
+contributions by @preetikhorjuvenkar, @Bisht13, @velemas,
+@AlekseiNikiforovIBM, and @iii-i.
 
 This is a cumulative patch of the DynASM changes from this work. It
 contains all the contributions squashed together, plus minor stylistic
@@ -24,6 +25,7 @@ Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
  src/Makefile           |    4 
  src/host/buildvm.c     |    2 
  src/host/buildvm_asm.c |   53 
+ src/jit/bcsave.lua     |    1 
  src/jit/dis_s390x.lua  |    1 
  src/lib_jit.c          |    2 
  src/lj_arch.h          |   19 
@@ -36,7 +38,7 @@ Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
  src/lj_target.h        |    2 
  src/lj_target_s390x.h  |   80 
  src/vm_s390x.dasc      | 4269 +++++++++++++++++++++++++++++++++++++++++++++++++
- 17 files changed, 6705 insertions(+)
+ 18 files changed, 6706 insertions(+)
  create mode 100644 dynasm/dasm_s390x.h
  create mode 100644 dynasm/dasm_s390x.lua
 
@@ -2333,6 +2335,16 @@ Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
  #else
      emit_asm_words(ctx, ctx->code+ofs, next-ofs);
  #endif
+--- a/src/jit/bcsave.lua
++++ b/src/jit/bcsave.lua
+@@ -101,6 +101,7 @@ local map_arch = {
+   mips64el =	{ e = "le", b = 64, m = 8, f = 0x80000007, },
+   mips64r6 =	{ e = "be", b = 64, m = 8, f = 0xa0000407, },
+   mips64r6el =	{ e = "le", b = 64, m = 8, f = 0xa0000407, },
++  s390x =	{ e = "be", b = 64, m = 22, },
+ }
+ 
+ local map_os = {
 --- /dev/null
 +++ b/src/jit/dis_s390x.lua
 @@ -0,0 +1 @@
@@ -2525,7 +2537,7 @@ Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
  #endif
 --- a/src/lj_err.c
 +++ b/src/lj_err.c
-@@ -448,6 +448,9 @@ LJ_FUNCA int lj_err_unwind_dwarf(int ver
+@@ -442,6 +442,9 @@ LJ_FUNCA int lj_err_unwind_dwarf(int ver
    if (version != 1)
      return _URC_FATAL_PHASE1_ERROR;
    cf = (void *)_Unwind_GetCFA(ctx);

luajit.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Fri Dec  6 07:23:43 UTC 2024 - Adrian Schröter <adrian@suse.de>
+
+- No loongarch64 support yet
+- turn around the logic to known supported architectures
+
+-------------------------------------------------------------------
+Wed Nov 20 07:23:12 UTC 2024 - mcepl@cepl.eu
+
+- Update to version 5.1.2.1.0+git.1731601260.fe71d0f:
+  * Windows: Allow amalgamated static builds with msvcbuild.bat.
+  * Always close profiler output file.
+  * Fix override of INSTALL_LJLIBD in the presence of DESTDIR.
+  * Fix bit op coercion for shifts in DUALNUM builds.
+
+-------------------------------------------------------------------
+Wed Nov 06 16:31:22 UTC 2024 - mcepl@cepl.eu
+
+- Update to version 5.1.2.1.0+git.1727870382.97813fb:
+  * macOS: Remove obsolete -single_module flag.
+  * macOS: Workaround for buggy XCode 15.0 - 15.2 linker.
+  * macOS: Fix macOS 15 / Clang 16 build.
+  * Fix bit op coercion in DUALNUM builds.
+  * Fix compiliation of getmetatable() for UDTYPE_IO_FILE.
+  * Remove ancient RtlUnwindEx workaround for MinGW64.
+  * Drop unused function wrapper.
+
+-------------------------------------------------------------------
+Wed Nov  6 16:25:34 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Update luajit-s390x.patch from
+  gh#openresty/luajit2!195 (following the advice on
+  gh#LuaJIT/LuaJIT!631#issuecomment-2459913131).
+
 -------------------------------------------------------------------
 Mon Aug 26 18:41:09 UTC 2024 - mcepl@cepl.eu
 

luajit.spec

@@ -19,13 +19,14 @@
 # These numbers are from readelf -a /usr/lib*/lib*.so* |grep soname (dots replaced by underscores)
 %define lib_version 5_1
 %define so_version 2
+%define upname LuaJIT
 Name:           luajit
-Version:        5.1.2.1.0+git.1724512491.f725e44
+Version:        5.1.2.1.0+git.1731601260.fe71d0f
 Release:        0
 Summary:        JIT compiler for Lua language
 License:        MIT
 URL:            https://luajit.org/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{upname}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE luajit-lua-versioned.patch mcepl@suse.com
 # Because we obsolete moonjit with version number higher than %%{version} we have to emulate Epoch
@@ -49,7 +50,7 @@ Obsoletes:      lua51-luajit <= 2.2.0
 Provides:       moonjit = %{version}-%{release}
 Obsoletes:      moonjit <= 2.2.0
 # lj_arch.h:441:2: error: #error "No target architecture defined"
-ExcludeArch:    riscv64 ppc64 ppc64le
+ExclusiveArch:  x86_64 %ix86 aarch64 %arm ppc mips mips64 mips64el s390x
 
 %description
 A Just-In-Time Compiler for Lua language
@@ -73,7 +74,7 @@ Provides:       libluajit-devel = %{version}-%{release}
 Devel files for luajit package
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{upname}-%{version}
 
 # Fix variables
 sed -i "s,PREFIX= %{_prefix}/local,PREFIX= %{_prefix}," Makefile