From 9e3ec9063910abcd5985d45649fd963e9e30f4b8 Mon Sep 17 00:00:00 2001 From: liuyu Date: Mon, 9 Oct 2023 16:18:38 +0800 Subject: [PATCH 1/2] Enable jit compiler in loongarch64 --- ...piler-of-loongarch64-port-by-default.patch | 54 +++++++++++++++++++ mozjs102.spec | 6 +++ 2 files changed, 60 insertions(+) create mode 100644 0012-enable-jit-compiler-of-loongarch64-port-by-default.patch diff --git a/0012-enable-jit-compiler-of-loongarch64-port-by-default.patch b/0012-enable-jit-compiler-of-loongarch64-port-by-default.patch new file mode 100644 index 0000000..7960efe --- /dev/null +++ b/0012-enable-jit-compiler-of-loongarch64-port-by-default.patch @@ -0,0 +1,54 @@ +From 4afb7390412988eb41ccaf264dea45876f0801d9 Mon Sep 17 00:00:00 2001 +From: liuyu +Date: Thu, 7 Sep 2023 19:17:52 +0800 +Subject: [PATCH] Enable JIT compiler of loong64 port by default + +--- + js/moz.configure | 2 ++ + js/src/wasm/WasmSignalHandlers.cpp | 10 +++++----- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/js/moz.configure b/js/moz.configure +index 7a241cac76..2bb7979e36 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -234,6 +234,8 @@ def jit_codegen(jit_enabled, simulator, target): + return namespace(arm64=True) + elif target.cpu == "x86_64": + return namespace(x64=True) ++ elif target.cpu == "loongarch64": ++ return namespace(loong64=True) + + return namespace(**{str(target.cpu): True}) + +diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp +index 4a45905431..074c373106 100644 +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp +@@ -158,10 +158,10 @@ using mozilla::DebugOnly; + # define R32_sig(p) ((p)->uc_mcontext.gp_regs[32]) + # endif + # if defined(__linux__) && defined(__loongarch__) +-# define EPC_sig(p) ((p)->uc_mcontext.pc) +-# define RRA_sig(p) ((p)->uc_mcontext.gregs[1]) +-# define RSP_sig(p) ((p)->uc_mcontext.gregs[3]) +-# define RFP_sig(p) ((p)->uc_mcontext.gregs[22]) ++# define EPC_sig(p) ((p)->uc_mcontext.__pc) ++# define RRA_sig(p) ((p)->uc_mcontext.__gregs[1]) ++# define R03_sig(p) ((p)->uc_mcontext.__gregs[3]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[22]) + # endif + # elif defined(__NetBSD__) + # define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP]) +@@ -403,7 +403,7 @@ struct macos_aarch64_context { + # elif defined(__loongarch__) + # define PC_sig(p) EPC_sig(p) + # define FP_sig(p) RFP_sig(p) +-# define SP_sig(p) RSP_sig(p) ++# define SP_sig(p) R03_sig(p) + # define LR_sig(p) RRA_sig(p) + # endif + +-- +2.20.1 + diff --git a/mozjs102.spec b/mozjs102.spec index 352c293..5dc9306 100644 --- a/mozjs102.spec +++ b/mozjs102.spec @@ -52,6 +52,9 @@ Patch10: 0010-spidermonkey_checks_disable.patch Patch11: 0011-Skip-failing-tests-on-aarch64.patch +# Enable jit compiler in loongarch64 +Patch12: 0012-enable-jit-compiler-of-loongarch64-port-by-default.patch + BuildRequires: cargo BuildRequires: clang-devel BuildRequires: gcc @@ -231,6 +234,9 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so %doc README.html %changelog +* Mon Oct 9 2023 liuyu - 102.15.0-2 +- Enable jit compiler in loongarch64 + * Thu Aug 31 2023 Funda Wang - 102.15.0-1 - New version 102.15.0 -- Gitee From 3ace4921dc88fec3b46977b3d3681d50012425f1 Mon Sep 17 00:00:00 2001 From: liuyu Date: Tue, 10 Oct 2023 06:14:59 +0000 Subject: [PATCH 2/2] update mozjs102.spec. Signed-off-by: liuyu --- mozjs102.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozjs102.spec b/mozjs102.spec index 5dc9306..4796f75 100644 --- a/mozjs102.spec +++ b/mozjs102.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global major 102 -- Gitee