summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/mozjs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/mozjs')
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch44
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch19
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch29
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch)7
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch27
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch)7
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch)3
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch)7
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch)9
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch)5
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch)3
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch28
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch)14
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch30
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch (renamed from meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch)15
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb (renamed from meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb)26
16 files changed, 136 insertions, 137 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
deleted file mode 100644
index 38496ea56c..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 7 Oct 2021 12:44:18 +0200
4Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize'
5 names
6
7The outcome is that processed names no longer match our custom rust
8target definitions, and the build fails.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12
13---
14 build/moz.configure/init.configure | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17--- a/build/moz.configure/init.configure
18+++ b/build/moz.configure/init.configure
19@@ -647,24 +647,7 @@ def help_host_target(help, host, target)
20
21 def config_sub(shell, triplet):
22 config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
23- # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
24- # munge those before and after calling config.sub.
25- suffix = None
26- munging = {
27- "-windows-msvc": "-mingw32",
28- "-windows-gnu": "-mingw32",
29- }
30- for check_suffix, replacement in munging.items():
31- if triplet.endswith(check_suffix):
32- suffix = check_suffix
33- triplet = triplet[: -len(suffix)] + replacement
34- break
35- result = check_cmd_output(shell, config_sub, triplet).strip()
36- if suffix:
37- assert result.endswith(replacement)
38- result = result[: -len(replacement)] + suffix
39- return result
40-
41+ return triplet
42
43 @depends("--host", shell)
44 @checking("for host system type", lambda h: h.alias)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
deleted file mode 100644
index 4c45955bca..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1The ISB instruction isn't available in ARMv5 or v6, so
2guard it's use to fix the build on qemuarmv5.
3
4Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@arm.com>
6
7diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
8--- a/js/src/jit/arm/Architecture-arm.cpp 2024-01-18 17:31:32.078718197 +0000
9+++ b/js/src/jit/arm/Architecture-arm.cpp 2024-01-18 18:00:16.738921445 +0000
10@@ -529,7 +529,9 @@
11 void FlushExecutionContext() {
12 #ifndef JS_SIMULATOR_ARM
13+#if __ARM_ARCH >= 7
14 // Ensure that any instructions already in the pipeline are discarded and
15 // reloaded from the icache.
16 asm volatile("isb\n" : : : "memory");
17+#endif
18 #else
19 // We assume the icache flushing routines on other platforms take care of this
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
deleted file mode 100644
index 22f31e05f8..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e4d8016d0dc56b02e22898d83aad9f80a94d1c3c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Oct 2021 16:21:14 -0700
4Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD
5
6Upstream: No
7Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
8https://github.com/void-linux/void-packages/issues/2598
9
10---
11Upstream-Status: Pending
12
13 js/src/old-configure.in | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/js/src/old-configure.in b/js/src/old-configure.in
17index cabd72a2b6..0f08d91cbf 100644
18--- a/js/src/old-configure.in
19+++ b/js/src/old-configure.in
20@@ -807,6 +807,9 @@ if test "$ac_cv_thread_keyword" = yes; then
21 *-android*|*-linuxandroid*)
22 :
23 ;;
24+ *-musl*)
25+ :
26+ ;;
27 *)
28 AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
29 ;;
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
index e8dfdea1e9..97a4439628 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
@@ -1,4 +1,4 @@
1From f501f7c02df4f0ff5d5f100d9eeb74cd4d12ea3d Mon Sep 17 00:00:00 2001 1From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 1 Oct 2021 13:00:24 +0200 3Date: Fri, 1 Oct 2021 13:00:24 +0200
4Subject: [PATCH] Cargo.toml: do not abort on panic 4Subject: [PATCH] Cargo.toml: do not abort on panic
@@ -7,16 +7,15 @@ OE's rust is configured to unwind, and this setting clashes with it/
7 7
8Upstream-Status: Inappropriate [oe-core specific] 8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de> 9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10
11--- 10---
12 Cargo.toml | 2 -- 11 Cargo.toml | 2 --
13 1 file changed, 2 deletions(-) 12 1 file changed, 2 deletions(-)
14 13
15diff --git a/Cargo.toml b/Cargo.toml 14diff --git a/Cargo.toml b/Cargo.toml
16index a2718b2f35..4e231c30e8 100644 15index a4248187be..eed8964b3a 100644
17--- a/Cargo.toml 16--- a/Cargo.toml
18+++ b/Cargo.toml 17+++ b/Cargo.toml
19@@ -59,13 +59,11 @@ opt-level = 1 18@@ -67,13 +67,11 @@ opt-level = 1
20 rpath = false 19 rpath = false
21 lto = false 20 lto = false
22 debug-assertions = true 21 debug-assertions = true
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
new file mode 100644
index 0000000000..4fb7a28eeb
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
@@ -0,0 +1,27 @@
1From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 23 Nov 2024 13:28:33 -0800
4Subject: [PATCH] Link with icu-uc to fix build with ICU-76
5
6Fixes
7https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 js/moz.configure | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/js/moz.configure b/js/moz.configure
16index 593b93acee..2181dca34b 100644
17--- a/js/moz.configure
18+++ b/js/moz.configure
19@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu):
20 return enable_system_icu
21
22
23-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
24+system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu")
25
26
27 @depends(enable_system_icu_option)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
index 83187861c7..960b4593c2 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
@@ -1,4 +1,4 @@
1From c5cfb8aa591afd5ad3aedc58fe7f410e89013605 Mon Sep 17 00:00:00 2001 1From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 22 Sep 2023 22:59:59 +0000 3Date: Fri, 22 Sep 2023 22:59:59 +0000
4Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for 4Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
@@ -12,16 +12,15 @@ Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
12Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] 12Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665]
13 13
14Signed-off-by: Kai Kang <kai.kang@windriver.com> 14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15
16--- 15---
17 js/src/jit/GenerateAtomicOperations.py | 2 +- 16 js/src/jit/GenerateAtomicOperations.py | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
19 18
20diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py 19diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
21index 24b5a191cf..e41948c5af 100644 20index 9194b8b685..145563bb37 100644
22--- a/js/src/jit/GenerateAtomicOperations.py 21--- a/js/src/jit/GenerateAtomicOperations.py
23+++ b/js/src/jit/GenerateAtomicOperations.py 22+++ b/js/src/jit/GenerateAtomicOperations.py
24@@ -860,7 +860,7 @@ def generate_atomics_header(c_out): 23@@ -850,7 +850,7 @@ def generate_atomics_header(c_out):
25 24
26 # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. 25 # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
27 # See bug 1756347. 26 # See bug 1756347.
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
index 83f384e6c2..94e1651b33 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
@@ -1,4 +1,4 @@
1From c6a84863454b882695058187cd282987613474ef Mon Sep 17 00:00:00 2001 1From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 18 Nov 2021 07:16:39 +0000 3Date: Thu, 18 Nov 2021 07:16:39 +0000
4Subject: [PATCH] Rewrite cargo-host-linker in python3 4Subject: [PATCH] Rewrite cargo-host-linker in python3
@@ -18,7 +18,6 @@ rewrite cargo-host-linker in python3
18Upstream-Status: Inappropriate [oe specific] 18Upstream-Status: Inappropriate [oe specific]
19 19
20Signed-off-by: Changqing Li <changqing.li@windriver.com> 20Signed-off-by: Changqing Li <changqing.li@windriver.com>
21
22--- 21---
23 build/cargo-host-linker | 24 +++++++++++++++++++++--- 22 build/cargo-host-linker | 24 +++++++++++++++++++++---
24 1 file changed, 21 insertions(+), 3 deletions(-) 23 1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
index 4921a9028c..d53cc2bd41 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
@@ -1,4 +1,4 @@
1From 0d28cd65efe14022e1d645db71dec74f11ab2ae8 Mon Sep 17 00:00:00 2001 1From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 11 Nov 2021 16:05:54 +0800 3Date: Thu, 11 Nov 2021 16:05:54 +0800
4Subject: [PATCH] util.configure: fix one occasionally reproduced configure 4Subject: [PATCH] util.configure: fix one occasionally reproduced configure
@@ -28,16 +28,15 @@ It should be another process that deleted this file by using
28Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] 28Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667]
29 29
30Signed-off-by: Changqing Li <changqing.li@windriver.com> 30Signed-off-by: Changqing Li <changqing.li@windriver.com>
31
32--- 31---
33 build/moz.configure/util.configure | 2 +- 32 build/moz.configure/util.configure | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-) 33 1 file changed, 1 insertion(+), 1 deletion(-)
35 34
36diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure 35diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
37index f5ff3acd79..44f69deceb 100644 36index d93b91fcdd..47ab8b92b9 100644
38--- a/build/moz.configure/util.configure 37--- a/build/moz.configure/util.configure
39+++ b/build/moz.configure/util.configure 38+++ b/build/moz.configure/util.configure
40@@ -254,7 +254,7 @@ def try_invoke_compiler( 39@@ -256,7 +256,7 @@ def try_invoke_compiler(
41 "C++": ".cpp", 40 "C++": ".cpp",
42 }[language] 41 }[language]
43 42
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
index 4c69155a68..9a82acf77b 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
@@ -1,4 +1,4 @@
1From 49cb509abd309e3b74ef4c872ae773f18dabca19 Mon Sep 17 00:00:00 2001 1From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 1 Oct 2021 13:01:10 +0200 3Date: Fri, 1 Oct 2021 13:01:10 +0200
4Subject: [PATCH] moz.configure: do not look for llvm-objdump 4Subject: [PATCH] moz.configure: do not look for llvm-objdump
@@ -8,17 +8,16 @@ for js builds.
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11
12--- 11---
13 moz.configure | 18 +++++++++--------- 12 moz.configure | 18 +++++++++---------
14 1 file changed, 9 insertions(+), 9 deletions(-) 13 1 file changed, 9 insertions(+), 9 deletions(-)
15 14
16diff --git a/moz.configure b/moz.configure 15diff --git a/moz.configure b/moz.configure
17index 3a9461200d..33b3f49b0c 100755 16index 804b9a375a..402e79e3b3 100755
18--- a/moz.configure 17--- a/moz.configure
19+++ b/moz.configure 18+++ b/moz.configure
20@@ -723,15 +723,15 @@ check_prog( 19@@ -390,15 +390,15 @@ def plain_llvm_or_prefixed(name, llvm_name=None):
21 ) 20 return plain_llvm_or_prefixed
22 21
23 22
24-llvm_objdump = check_prog( 23-llvm_objdump = check_prog(
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
index 0f9d062205..40025fbc68 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
@@ -1,4 +1,4 @@
1From ac6a3711917ff3f2b64662cbf4681c22a09da403 Mon Sep 17 00:00:00 2001 1From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 1 Oct 2021 13:02:17 +0200 3Date: Fri, 1 Oct 2021 13:02:17 +0200
4Subject: [PATCH] rust.configure: do not try to find a suitable upstream target 4Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
@@ -7,13 +7,12 @@ OE is using custom targets and so this is bound to fail.
7 7
8Upstream-Status: Inappropriate [oe-core specific] 8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex@linutronix.de> 9Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10
11--- 10---
12 build/moz.configure/rust.configure | 34 ++---------------------------- 11 build/moz.configure/rust.configure | 34 ++----------------------------
13 1 file changed, 2 insertions(+), 32 deletions(-) 12 1 file changed, 2 insertions(+), 32 deletions(-)
14 13
15diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure 14diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
16index 7a2fd1ae70..e11f13b253 100644 15index acac34ec05..ff3b8fc0fd 100644
17--- a/build/moz.configure/rust.configure 16--- a/build/moz.configure/rust.configure
18+++ b/build/moz.configure/rust.configure 17+++ b/build/moz.configure/rust.configure
19@@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): 18@@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
index 6443d46b2c..eb3ff452b3 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
@@ -1,4 +1,4 @@
1From 607aa4d822b0e074ae1b2fc16d7c140c3e889680 Mon Sep 17 00:00:00 2001 1From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <amccurdy@gmail.com> 2From: Andre McCurdy <amccurdy@gmail.com>
3Date: Sat, 30 Apr 2016 15:29:06 -0700 3Date: Sat, 30 Apr 2016 15:29:06 -0700
4Subject: [PATCH] use <asm/sgidefs.h> 4Subject: [PATCH] use <asm/sgidefs.h>
@@ -18,7 +18,6 @@ Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
18Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 18Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
19Signed-off-by: Khem Raj <raj.khem@gmail.com> 19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 20Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
21
22--- 21---
23 mfbt/RandomNum.cpp | 2 +- 22 mfbt/RandomNum.cpp | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
new file mode 100644
index 0000000000..564f423fb4
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
@@ -0,0 +1,28 @@
1From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Mon, 16 Dec 2024 05:49:57 +0000
4Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard
5 it's use to fix the build on qemuarmv5.
6
7Upstream-Status: Pending
8Signed-off-by: Ross Burton <ross.burton@arm.com>
9---
10 js/src/jit/arm/Architecture-arm.cpp | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
14index d4c5026705..fc0455eaff 100644
15--- a/js/src/jit/arm/Architecture-arm.cpp
16+++ b/js/src/jit/arm/Architecture-arm.cpp
17@@ -528,9 +528,11 @@ void FlushICache(void* code, size_t size) {
18
19 void FlushExecutionContext() {
20 #ifndef JS_SIMULATOR_ARM
21+#if __ARM_ARCH >= 7
22 // Ensure that any instructions already in the pipeline are discarded and
23 // reloaded from the icache.
24 asm volatile("isb\n" : : : "memory");
25+#endif
26 #else
27 // We assume the icache flushing routines on other platforms take care of this
28 #endif
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
index 590cddfe5f..3d5452ce4d 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
@@ -1,27 +1,27 @@
1From 9aae71c6ee73431d2609be0ef74ffd4b22b36c75 Mon Sep 17 00:00:00 2001 1From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 22 Sep 2023 22:59:56 +0000 3Date: Fri, 22 Sep 2023 22:59:56 +0000
4Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can 4Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can
5
5 not assume that its always available on musl, we do need to check for target 6 not assume that its always available on musl, we do need to check for target
6 environment as well which could be musl or glibc. 7 environment as well which could be musl or glibc.
7 8
8Upstream-Status: Pending 9Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11--- 11---
12 mozglue/misc/StackWalk.cpp | 2 +- 12 mozglue/misc/StackWalk.cpp | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp 15diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
16index 307715b170..a8d3cb40c0 100644 16index 18fd3464b0..d3d9208fdb 100644
17--- a/mozglue/misc/StackWalk.cpp 17--- a/mozglue/misc/StackWalk.cpp
18+++ b/mozglue/misc/StackWalk.cpp 18+++ b/mozglue/misc/StackWalk.cpp
19@@ -43,7 +43,7 @@ using namespace mozilla; 19@@ -50,7 +50,7 @@ using namespace mozilla;
20 # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 20 # define HAVE___LIBC_STACK_END 0
21 #endif 21 #endif
22 22
23-#if (defined(linux) && \ 23-#if (defined(linux) && \
24+#if (defined(linux) && defined(__GLIBC__) && \ 24+#if (defined(linux) && defined(__GLIBC__) && \
25 ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ 25 ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
26 defined(HAVE__UNWIND_BACKTRACE))) 26 defined(HAVE__UNWIND_BACKTRACE)) && \
27 # define MOZ_STACKWALK_SUPPORTS_LINUX 1 27 (HAVE___LIBC_STACK_END || ANDROID))
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
new file mode 100644
index 0000000000..cb2dc66525
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
@@ -0,0 +1,30 @@
1Recognise riscv64gc and riscv32gc as valid architectures
2
3Rust uses above for architecture in tuples
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
8+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
9@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas
10 "mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
11 "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
12 "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
13+ "riscv32gc-unknown-linux-gnu": little_endian
14+ + {"__riscv": 1, "__riscv_xlen": 32},
15+ "riscv64gc-unknown-linux-gnu": little_endian
16+ + {"__riscv": 1, "__riscv_xlen": 64},
17 "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
18 }
19
20--- a/build/autoconf/config.sub
21+++ b/build/autoconf/config.sub
22@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
23 | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
24 | pru \
25 | pyramid \
26- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
27+ | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
28 | rl78 | romp | rs6000 | rx \
29 | s390 | s390x \
30 | score \
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
index 16f95659e2..67e23c5fcc 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
@@ -1,11 +1,10 @@
1From d6aff068170e56e6773feba42a463dd8c50bc4ff Mon Sep 17 00:00:00 2001 1From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 24 Oct 2021 22:32:50 -0700 3Date: Sun, 24 Oct 2021 22:32:50 -0700
4Subject: [PATCH] Add RISCV32 support 4Subject: [PATCH] Add RISCV32 support
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9--- 8---
10 build/moz.configure/init.configure | 3 +++ 9 build/moz.configure/init.configure | 3 +++
11 python/mozbuild/mozbuild/configure/constants.py | 2 ++ 10 python/mozbuild/mozbuild/configure/constants.py | 2 ++
@@ -13,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 3 files changed, 6 insertions(+) 12 3 files changed, 6 insertions(+)
14 13
15diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure 14diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
16index 53bbc4203f..2ac40d3d39 100644 15index 97b9bab167..d9a5a2035d 100644
17--- a/build/moz.configure/init.configure 16--- a/build/moz.configure/init.configure
18+++ b/build/moz.configure/init.configure 17+++ b/build/moz.configure/init.configure
19@@ -584,6 +584,9 @@ def split_triplet(triplet, allow_wasi=False): 18@@ -594,6 +594,9 @@ def split_triplet(triplet, allow_wasi=False):
20 elif cpu.startswith("aarch64"): 19 elif cpu.startswith("aarch64"):
21 canonical_cpu = "aarch64" 20 canonical_cpu = "aarch64"
22 endianness = "little" 21 endianness = "little"
@@ -27,10 +26,10 @@ index 53bbc4203f..2ac40d3d39 100644
27 canonical_cpu = "riscv64" 26 canonical_cpu = "riscv64"
28 endianness = "little" 27 endianness = "little"
29diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py 28diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
30index a36152651d..a6050be5d8 100644 29index 25f43bb9f8..3335e69405 100644
31--- a/python/mozbuild/mozbuild/configure/constants.py 30--- a/python/mozbuild/mozbuild/configure/constants.py
32+++ b/python/mozbuild/mozbuild/configure/constants.py 31+++ b/python/mozbuild/mozbuild/configure/constants.py
33@@ -51,6 +51,7 @@ CPU_bitness = { 32@@ -73,6 +73,7 @@ CPU_bitness = {
34 "mips64": 64, 33 "mips64": 64,
35 "ppc": 32, 34 "ppc": 32,
36 "ppc64": 64, 35 "ppc64": 64,
@@ -38,7 +37,7 @@ index a36152651d..a6050be5d8 100644
38 "riscv64": 64, 37 "riscv64": 64,
39 "s390": 32, 38 "s390": 32,
40 "s390x": 64, 39 "s390x": 64,
41@@ -98,6 +99,7 @@ CPU_preprocessor_checks = OrderedDict( 40@@ -129,6 +130,7 @@ CPU_preprocessor_checks = OrderedDict(
42 ("m68k", "__m68k__"), 41 ("m68k", "__m68k__"),
43 ("mips64", "__mips64"), 42 ("mips64", "__mips64"),
44 ("mips32", "__mips__"), 43 ("mips32", "__mips__"),
@@ -47,7 +46,7 @@ index a36152651d..a6050be5d8 100644
47 ("loongarch64", "__loongarch64"), 46 ("loongarch64", "__loongarch64"),
48 ("sh4", "__sh__"), 47 ("sh4", "__sh__"),
49diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py 48diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
50index c6af3d99d4..7ef02e1a85 100644 49index d438b68eb8..1be0d02e54 100644
51--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py 50--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
52+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py 51+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
53@@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): 52@@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
index b088286023..ceb81d07e5 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
@@ -8,22 +8,25 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
8 file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ 8 file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
9 file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ 9 file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
10 file://0004-use-asm-sgidefs.h.patch \ 10 file://0004-use-asm-sgidefs.h.patch \
11 file://fix-musl-build.patch \
12 file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \
13 file://riscv32.patch \ 11 file://riscv32.patch \
14 file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ 12 file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
15 file://0001-rewrite-cargo-host-linker-in-python3.patch \ 13 file://0001-rewrite-cargo-host-linker-in-python3.patch \
16 file://musl-disable-stackwalk.patch \ 14 file://musl-disable-stackwalk.patch \
17 file://0001-add-arm-to-list-of-mozinline.patch \ 15 file://0001-add-arm-to-list-of-mozinline.patch \
18 file://armv5.patch \ 16 file://armv5.patch \
17 file://0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
18 file://riscv.patch \
19 " 19 "
20SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" 20SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
21 21
22S = "${WORKDIR}/firefox-${PV}" 22UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
23UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
23 24
24inherit pkgconfig perlnative python3native rust 25S = "${UNPACKDIR}/firefox-${PV}"
25 26
26DEPENDS += "zlib cargo-native python3 icu" 27inherit pkgconfig perlnative python3native rust cargo
28
29DEPENDS += "zlib cbindgen-native python3 icu"
27DEPENDS:remove:mipsarch = "icu" 30DEPENDS:remove:mipsarch = "icu"
28DEPENDS:remove:powerpc:toolchain-clang = "icu" 31DEPENDS:remove:powerpc:toolchain-clang = "icu"
29 32
@@ -54,6 +57,7 @@ export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}"
54 57
55export AS = "${CC}" 58export AS = "${CC}"
56 59
60export MOZBUILD_STATE_PATH = "${WORKDIR}/mozbuild_state"
57export RUSTFLAGS 61export RUSTFLAGS
58 62
59JIT ?= "" 63JIT ?= ""
@@ -62,6 +66,8 @@ ICU ?= "--with-system-icu"
62ICU:mipsarch = "" 66ICU:mipsarch = ""
63ICU:powerpc:toolchain-clang = "" 67ICU:powerpc:toolchain-clang = ""
64 68
69LDFLAGS:append:riscv32 = " -latomic"
70
65do_configure() { 71do_configure() {
66 cd ${B} 72 cd ${B}
67 python3 ${S}/configure.py \ 73 python3 ${S}/configure.py \
@@ -77,6 +83,13 @@ do_configure() {
77} 83}
78do_configure[cleandirs] += "${B}" 84do_configure[cleandirs] += "${B}"
79 85
86# The main build system is a Makefile that call cargo downstream.
87# We inherit cargo to get the environnement but need to switch back to
88# base_do_compile to do the Makefile base compilation.
89do_compile() {
90 base_do_compile
91}
92
80do_install() { 93do_install() {
81 oe_runmake 'DESTDIR=${D}' install 94 oe_runmake 'DESTDIR=${D}' install
82} 95}
@@ -93,6 +106,7 @@ do_install:append() {
93 rm -f ${D}${libdir}/libjs_static.ajs 106 rm -f ${D}${libdir}/libjs_static.ajs
94} 107}
95 108
109INSANE_SKIP += "32bit-time"
96PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 110PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
97PACKAGES =+ "lib${BPN}" 111PACKAGES =+ "lib${BPN}"
98FILES:lib${BPN} += "${libdir}/lib*" 112FILES:lib${BPN} += "${libdir}/lib*"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 09:55:55 +0000