[packages/mozjs128] - mozjs115 updated to 128.1.0 as mozjs128
qboosh
qboosh at pld-linux.org
Thu Aug 22 21:41:13 CEST 2024
commit 99ac1b03a108b39273a60d3ab7541bfcced0756b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Aug 22 21:35:03 2024 +0200
- mozjs115 updated to 128.1.0 as mozjs128
mozjs115.spec => mozjs128.spec | 24 ++++++++++++------------
x32.patch | 34 +++++++++++++++++-----------------
2 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/mozjs115.spec b/mozjs128.spec
similarity index 89%
rename from mozjs115.spec
rename to mozjs128.spec
index 7656db5..7d3dba1 100644
--- a/mozjs115.spec
+++ b/mozjs128.spec
@@ -2,16 +2,16 @@
# Conditional build:
%bcond_without tests # tests build
-Summary: SpiderMonkey 115 - JavaScript implementation
-Summary(pl.UTF-8): SpiderMonkey 115 - implementacja języka JavaScript
-Name: mozjs115
-Version: 115.2.1
+Summary: SpiderMonkey 128 - JavaScript implementation
+Summary(pl.UTF-8): SpiderMonkey 128 - implementacja języka JavaScript
+Name: mozjs128
+Version: 128.1.0
Release: 1
License: MPL v2.0
Group: Libraries
#Source0: https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.xz
Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-# Source0-md5: c8deec3a0e558a1882f11bbea2fbd462
+# Source0-md5: efbf349f0b7442fc6f2995bef4d32785
Patch0: copy-headers.patch
Patch1: include-configure-script.patch
Patch2: x32.patch
@@ -34,8 +34,8 @@ BuildRequires: python3-virtualenv >= 1.9.1-4
BuildRequires: readline-devel
BuildRequires: rpm-perlprov
BuildRequires: rpmbuild(macros) >= 1.294
-BuildRequires: rust >= 1.66.0
-BuildRequires: rust-cbindgen >= 0.24.3
+BuildRequires: rust >= 1.76.0
+BuildRequires: rust-cbindgen >= 0.26.0
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: zlib-devel >= 1.2.3
@@ -138,11 +138,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc js/src/README.html
-%attr(755,root,root) %{_bindir}/js115
-%attr(755,root,root) %{_libdir}/libmozjs-115.so
+%attr(755,root,root) %{_bindir}/js128
+%attr(755,root,root) %{_libdir}/libmozjs-128.so
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/js115-config
-%{_includedir}/mozjs-115
-%{_pkgconfigdir}/mozjs-115.pc
+%attr(755,root,root) %{_bindir}/js128-config
+%{_includedir}/mozjs-128
+%{_pkgconfigdir}/mozjs-128.pc
diff --git a/x32.patch b/x32.patch
index 0f8c937..13f573a 100644
--- a/x32.patch
+++ b/x32.patch
@@ -54,8 +54,8 @@
Digit quotient;
Digit rem;
__asm__("divq %[divisor]"
---- firefox-102.5.0/js/src/jit/GenerateAtomicOperations.py.orig 2022-11-07 22:06:45.000000000 +0100
-+++ firefox-102.5.0/js/src/jit/GenerateAtomicOperations.py 2023-01-21 21:11:44.361987341 +0100
+--- firefox-128.1.0/js/src/jit/GenerateAtomicOperations.py.orig 2024-08-01 22:00:03.000000000 +0200
++++ firefox-128.1.0/js/src/jit/GenerateAtomicOperations.py 2024-08-19 06:09:14.650137845 +0200
@@ -18,7 +18,7 @@ def fmt_insn(s):
@@ -72,18 +72,18 @@
- if cpu_arch in ("x86", "x86_64"):
+ if cpu_arch in ("x86", "x86_64", "x32"):
insns = ""
- if barrier:
- insns += fmt_insn("mfence")
-@@ -139,7 +139,7 @@ def gen_store(fun_name, cpp_type, size,
+ if size == 8:
+ insns += fmt_insn("movb (%[arg]), %[res]")
+@@ -131,7 +131,7 @@ def gen_store(fun_name, cpp_type, size,
# - LIRGenerator::visitStoreUnboxedScalar
# - CodeGenerator::visitAtomicStore64 (on 64-bit platforms)
# - MacroAssembler::wasmStore
- if cpu_arch in ("x86", "x86_64"):
+ if cpu_arch in ("x86", "x86_64", "x32"):
insns = ""
- if barrier:
- insns += fmt_insn("mfence")
-@@ -222,7 +222,7 @@ def gen_exchange(fun_name, cpp_type, siz
+ if size == 8:
+ insns += fmt_insn("movb %[val], (%[addr])")
+@@ -212,7 +212,7 @@ def gen_exchange(fun_name, cpp_type, siz
# NOTE: the assembly code must match the generated code in:
# - MacroAssembler::atomicExchange
# - MacroAssembler::atomicExchange64 (on 64-bit platforms)
@@ -92,7 +92,7 @@
# Request an input/output register for `val` so that we can simply XCHG it
# with *addr.
insns = ""
-@@ -368,7 +368,7 @@ def gen_cmpxchg(fun_name, cpp_type, size
+@@ -358,7 +358,7 @@ def gen_cmpxchg(fun_name, cpp_type, size
"cpp_type": cpp_type,
"fun_name": fun_name,
}
@@ -101,7 +101,7 @@
# Use a +a constraint to load `oldval` into RAX as input/output register.
insns = ""
if size == 8:
-@@ -488,7 +488,7 @@ def gen_fetchop(fun_name, cpp_type, size
+@@ -478,7 +478,7 @@ def gen_fetchop(fun_name, cpp_type, size
# NOTE: the assembly code must match the generated code in:
# - MacroAssembler::atomicFetchOp
# - MacroAssembler::atomicFetchOp64 (on 64-bit platforms)
@@ -110,7 +110,7 @@
# The `add` operation can be optimized with XADD.
if op == "add":
insns = ""
-@@ -645,7 +645,7 @@ def gen_copy(fun_name, cpp_type, size, u
+@@ -635,7 +635,7 @@ def gen_copy(fun_name, cpp_type, size, u
offset = unroll - 1
insns = ""
for i in range(unroll):
@@ -119,7 +119,7 @@
if size == 1:
insns += fmt_insn("movb OFFSET(%[src]), %[scratch]")
insns += fmt_insn("movb %[scratch], OFFSET(%[dst])")
-@@ -721,7 +721,7 @@ namespace jit {
+@@ -713,7 +713,7 @@ namespace jit {
def generate_atomics_header(c_out):
contents = ""
@@ -128,14 +128,14 @@
cpu_arch == "arm" and int(buildconfig.substs["ARM_ARCH"]) >= 7
):
contents += "#define JS_HAVE_GENERATED_ATOMIC_OPS 1"
---- firefox-115.2.1/mozglue/misc/moz.build.orig 2023-09-12 06:32:32.000000000 +0200
-+++ firefox-115.2.1/mozglue/misc/moz.build 2023-09-23 16:32:11.054352318 +0200
-@@ -51,7 +51,7 @@ SOURCES += [
+--- firefox-128.1.0/mozglue/misc/moz.build.orig 2024-08-19 05:50:54.000000000 +0200
++++ firefox-128.1.0/mozglue/misc/moz.build 2024-08-19 06:10:59.793636471 +0200
+@@ -52,7 +52,7 @@ SOURCES += [
"Uptime.cpp",
]
--if CONFIG["CPU_ARCH"].startswith("x86"):
-+if CONFIG["CPU_ARCH"].startswith("x86") or CONFIG["CPU_ARCH"].startswith("x32"):
+-if CONFIG["TARGET_CPU"].startswith("x86"):
++if CONFIG["TARGET_CPU"].startswith("x86") or CONFIG["TARGET_CPU"].startswith("x32"):
SOURCES += [
"SIMD_avx2.cpp",
"SSE.cpp",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozjs128.git/commitdiff/99ac1b03a108b39273a60d3ab7541bfcced0756b
More information about the pld-cvs-commit
mailing list