From 6cb598129db4d735b3e8000cc43f258a9c928e94 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Mon, 19 Jan 2026 21:27:39 +1300 Subject: mozjs-128: Fix build error with arm and musl Build fails for qemuarm with musl with following error: mozglue/misc/StackWalk.o: in function `unwind_callback(_Unwind_Context*, void*)': | /usr/src/debug/mozjs-128/128.5.2/mozglue/misc/StackWalk.cpp:810:(.text._ZL15unwind_callbackP15_Unwind_ContextPv+0x4): undefined reference to `_Unwind_GetIP' Referenced commit[1] for the fix, also refreshed patches. [1] https://github.com/OSSystems/meta-browser/commit/bb8662912354dae13634c0ec35c3803c344b1e72 Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj (cherry picked from commit 30942cebe8997dbadcd8bcd81ed0e55d42b48677) Signed-off-by: Ankur Tyagi Signed-off-by: Anuj Mittal --- .../0001-Cargo.toml-do-not-abort-on-panic.patch | 2 +- ...Link-with-icu-uc-to-fix-build-with-ICU-76.patch | 27 ---------- .../0001-add-arm-to-list-of-mozinline.patch | 31 ------------ ...0001-rewrite-cargo-host-linker-in-python3.patch | 53 ------------------- ...ure-fix-one-occasionally-reproduced-confi.patch | 47 ----------------- ...oz.configure-do-not-look-for-llvm-objdump.patch | 2 +- ...ure-do-not-try-to-find-a-suitable-upstrea.patch | 2 +- .../mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch | 2 +- .../mozjs/mozjs-128/0005-Add-RISCV32-support.patch | 59 ++++++++++++++++++++++ ...ure-fix-one-occasionally-reproduced-confi.patch | 47 +++++++++++++++++ ...0007-Rewrite-cargo-host-linker-in-python3.patch | 53 +++++++++++++++++++ ...ot-have-stack-unwinder-like-glibc-therefo.patch | 27 ++++++++++ ...tch-from-firefox-bugzilla-to-fix-compile-.patch | 31 ++++++++++++ ...truction-isn-t-available-in-ARMv5-or-v6-s.patch | 28 ++++++++++ ...Link-with-icu-uc-to-fix-build-with-ICU-76.patch | 27 ++++++++++ ...iscv64gc-and-riscv32gc-as-valid-architect.patch | 42 +++++++++++++++ .../mozjs-128/0013-Fix-build-error-with-musl.patch | 30 +++++++++++ .../recipes-extended/mozjs/mozjs-128/armv5.patch | 28 ---------- .../mozjs/mozjs-128/musl-disable-stackwalk.patch | 27 ---------- .../recipes-extended/mozjs/mozjs-128/riscv.patch | 30 ----------- .../recipes-extended/mozjs/mozjs-128/riscv32.patch | 59 ---------------------- .../recipes-extended/mozjs/mozjs-128_128.5.2.bb | 17 ++++--- 22 files changed, 357 insertions(+), 314 deletions(-) delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch delete mode 100644 meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/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 97a4439628..5c81126f0b 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/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 @@ -From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001 +From ffb7b90712189c9fa8634e4dc915c3afb4448d87 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:00:24 +0200 Subject: [PATCH] Cargo.toml: do not abort on panic 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 deleted file mode 100644 index 4fb7a28eeb..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 23 Nov 2024 13:28:33 -0800 -Subject: [PATCH] Link with icu-uc to fix build with ICU-76 - -Fixes -https://bugzilla.mozilla.org/show_bug.cgi?id=1927380 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - js/moz.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/moz.configure b/js/moz.configure -index 593b93acee..2181dca34b 100644 ---- a/js/moz.configure -+++ b/js/moz.configure -@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu): - return enable_system_icu - - --system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu") -+system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu") - - - @depends(enable_system_icu_option) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch deleted file mode 100644 index 960b4593c2..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001 -From: Kai Kang -Date: Fri, 22 Sep 2023 22:59:59 +0000 -Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for - qemuarm with some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': - -| /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: - error: 'asm' operand has impossible constraints -| 240 | asm volatile ( -| | ^~~ - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] - -Signed-off-by: Kai Kang ---- - js/src/jit/GenerateAtomicOperations.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py -index 9194b8b685..145563bb37 100644 ---- a/js/src/jit/GenerateAtomicOperations.py -+++ b/js/src/jit/GenerateAtomicOperations.py -@@ -850,7 +850,7 @@ def generate_atomics_header(c_out): - - # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. - # See bug 1756347. -- if is_gcc and cpu_arch == "x86": -+ if is_gcc and cpu_arch in ("x86", "arm"): - contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") - else: - contents = contents.replace("INLINE_ATTR", "inline") diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch deleted file mode 100644 index 94e1651b33..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 18 Nov 2021 07:16:39 +0000 -Subject: [PATCH] Rewrite cargo-host-linker in python3 - -Mozjs compile failed with this failure: -/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) - -Root Cause: -cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd -with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links -libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But -host libc is older libc. So the incompatible problem occurred. - -Solution: -rewrite cargo-host-linker in python3 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Changqing Li ---- - build/cargo-host-linker | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/build/cargo-host-linker b/build/cargo-host-linker -index cbd0472bf7..87d43ce9ec 100755 ---- a/build/cargo-host-linker -+++ b/build/cargo-host-linker -@@ -1,3 +1,21 @@ --#!/bin/sh --# See comment in cargo-linker. --eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' -+#!/usr/bin/env python3 -+ -+import os,sys -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): -+ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] -+else: -+ sys.exit(0) -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+else: -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] -+ -+os.execvp(binary, args) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/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 deleted file mode 100644 index d53cc2bd41..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 11 Nov 2021 16:05:54 +0800 -Subject: [PATCH] util.configure: fix one occasionally reproduced configure - failure - -error: -| checking whether the C++ compiler supports -Wno-range-loop-analysis... -| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: -| DEBUG: | int -| DEBUG: | main(void) -| DEBUG: | { -| DEBUG: | -| DEBUG: | ; -| DEBUG: | return 0; -| DEBUG: | } -| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c -| DEBUG: The command returned non-zero exit status 1. -| DEBUG: Its error output was: -... -| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler -| os.remove(path) -| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' - -It should be another process that deleted this file by using -"rm -rf conftest*" inappropriately - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] - -Signed-off-by: Changqing Li ---- - build/moz.configure/util.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure -index d93b91fcdd..47ab8b92b9 100644 ---- a/build/moz.configure/util.configure -+++ b/build/moz.configure/util.configure -@@ -256,7 +256,7 @@ def try_invoke_compiler( - "C++": ".cpp", - }[language] - -- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) -+ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) - try: - source = source.encode("ascii", "replace") - diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/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 9a82acf77b..0616aa3ee7 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/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 @@ -From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001 +From 0f885ae37ef7cd94fd0712cefb5d3314fbcfdf44 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:01:10 +0200 Subject: [PATCH] moz.configure: do not look for llvm-objdump diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/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 40025fbc68..8367a62a39 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/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 @@ -From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001 +From ca6cf215462de8f82fd27ad75eb20ac24fc0c512 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:02:17 +0200 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch index eb3ff452b3..5832f36975 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001 +From af704b888a91fc3a0f88b0ef2f36de1faaf7d6e2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch new file mode 100644 index 0000000000..2359373999 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0005-Add-RISCV32-support.patch @@ -0,0 +1,59 @@ +From 8b7f96cc479c99a286591ac6dcd0be19bcf83b15 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 24 Oct 2021 22:32:50 -0700 +Subject: [PATCH] Add RISCV32 support + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + build/moz.configure/init.configure | 3 +++ + python/mozbuild/mozbuild/configure/constants.py | 2 ++ + .../mozbuild/test/configure/test_toolchain_configure.py | 1 + + 3 files changed, 6 insertions(+) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 97b9bab167..d9a5a2035d 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -594,6 +594,9 @@ def split_triplet(triplet, allow_wasi=False): + elif cpu.startswith("aarch64"): + canonical_cpu = "aarch64" + endianness = "little" ++ elif cpu in ("riscv32", "riscv32gc"): ++ canonical_cpu = "riscv32" ++ endianness = "little" + elif cpu in ("riscv64", "riscv64gc"): + canonical_cpu = "riscv64" + endianness = "little" +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 25f43bb9f8..3335e69405 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -73,6 +73,7 @@ CPU_bitness = { + "mips64": 64, + "ppc": 32, + "ppc64": 64, ++ 'riscv32': 32, + "riscv64": 64, + "s390": 32, + "s390x": 64, +@@ -129,6 +130,7 @@ CPU_preprocessor_checks = OrderedDict( + ("m68k", "__m68k__"), + ("mips64", "__mips64"), + ("mips32", "__mips__"), ++ ("riscv32", "__riscv && __riscv_xlen == 32"), + ("riscv64", "__riscv && __riscv_xlen == 64"), + ("loongarch64", "__loongarch64"), + ("sh4", "__sh__"), +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +index d438b68eb8..1be0d02e54 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): + "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, + "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, + "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, ++ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, + "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, + "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, + } diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch new file mode 100644 index 0000000000..9cc7831876 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0006-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -0,0 +1,47 @@ +From 13b544e4ed51f41138bf200eb84552e169df87b0 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 11 Nov 2021 16:05:54 +0800 +Subject: [PATCH] util.configure: fix one occasionally reproduced configure + failure + +error: +| checking whether the C++ compiler supports -Wno-range-loop-analysis... +| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: +| DEBUG: | int +| DEBUG: | main(void) +| DEBUG: | { +| DEBUG: | +| DEBUG: | ; +| DEBUG: | return 0; +| DEBUG: | } +| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c +| DEBUG: The command returned non-zero exit status 1. +| DEBUG: Its error output was: +... +| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler +| os.remove(path) +| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' + +It should be another process that deleted this file by using +"rm -rf conftest*" inappropriately + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] + +Signed-off-by: Changqing Li +--- + build/moz.configure/util.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure +index d93b91fcdd..47ab8b92b9 100644 +--- a/build/moz.configure/util.configure ++++ b/build/moz.configure/util.configure +@@ -256,7 +256,7 @@ def try_invoke_compiler( + "C++": ".cpp", + }[language] + +- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) ++ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) + try: + source = source.encode("ascii", "replace") + diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch new file mode 100644 index 0000000000..9d6a89214b --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0007-Rewrite-cargo-host-linker-in-python3.patch @@ -0,0 +1,53 @@ +From 31d56eba10e7cf856a2a118e0523633195fe9ea2 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 18 Nov 2021 07:16:39 +0000 +Subject: [PATCH] Rewrite cargo-host-linker in python3 + +Mozjs compile failed with this failure: +/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) + +Root Cause: +cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd +with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links +libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But +host libc is older libc. So the incompatible problem occurred. + +Solution: +rewrite cargo-host-linker in python3 + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li +--- + build/cargo-host-linker | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/build/cargo-host-linker b/build/cargo-host-linker +index cbd0472bf7..87d43ce9ec 100755 +--- a/build/cargo-host-linker ++++ b/build/cargo-host-linker +@@ -1,3 +1,21 @@ +-#!/bin/sh +-# See comment in cargo-linker. +-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' ++#!/usr/bin/env python3 ++ ++import os,sys ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): ++ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] ++else: ++ sys.exit(0) ++ ++if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] ++else: ++ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] ++ else: ++ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] ++ ++os.execvp(binary, args) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch new file mode 100644 index 0000000000..91614291c7 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch @@ -0,0 +1,27 @@ +From fae21326f717f1c0031f3ad0ff4c3112ffb3a936 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 22 Sep 2023 22:59:56 +0000 +Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can + + not assume that its always available on musl, we do need to check for target + environment as well which could be musl or glibc. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mozglue/misc/StackWalk.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp +index 18fd3464b0..d3d9208fdb 100644 +--- a/mozglue/misc/StackWalk.cpp ++++ b/mozglue/misc/StackWalk.cpp +@@ -50,7 +50,7 @@ using namespace mozilla; + # define HAVE___LIBC_STACK_END 0 + #endif + +-#if (defined(linux) && \ ++#if (defined(linux) && defined(__GLIBC__) && \ + ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ + defined(HAVE__UNWIND_BACKTRACE)) && \ + (HAVE___LIBC_STACK_END || ANDROID)) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch new file mode 100644 index 0000000000..a2e3c08edf --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch @@ -0,0 +1,31 @@ +From 7dc235e1558b087c69024ed40c6066bd8126f2a3 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Fri, 22 Sep 2023 22:59:59 +0000 +Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for + qemuarm with some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': + +| /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: + error: 'asm' operand has impossible constraints +| 240 | asm volatile ( +| | ^~~ + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] + +Signed-off-by: Kai Kang +--- + js/src/jit/GenerateAtomicOperations.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +index 9194b8b685..145563bb37 100644 +--- a/js/src/jit/GenerateAtomicOperations.py ++++ b/js/src/jit/GenerateAtomicOperations.py +@@ -850,7 +850,7 @@ def generate_atomics_header(c_out): + + # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. + # See bug 1756347. +- if is_gcc and cpu_arch == "x86": ++ if is_gcc and cpu_arch in ("x86", "arm"): + contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") + else: + contents = contents.replace("INLINE_ATTR", "inline") diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch new file mode 100644 index 0000000000..e2e935eb03 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch @@ -0,0 +1,28 @@ +From e94edc3eba7ea158806283d92ecd71ab87351838 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 16 Dec 2024 05:49:57 +0000 +Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard + it's use to fix the build on qemuarmv5. + +Upstream-Status: Pending +Signed-off-by: Ross Burton +--- + js/src/jit/arm/Architecture-arm.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp +index d4c5026705..fc0455eaff 100644 +--- a/js/src/jit/arm/Architecture-arm.cpp ++++ b/js/src/jit/arm/Architecture-arm.cpp +@@ -528,9 +528,11 @@ void FlushICache(void* code, size_t size) { + + void FlushExecutionContext() { + #ifndef JS_SIMULATOR_ARM ++#if __ARM_ARCH >= 7 + // Ensure that any instructions already in the pipeline are discarded and + // reloaded from the icache. + asm volatile("isb\n" : : : "memory"); ++#endif + #else + // We assume the icache flushing routines on other platforms take care of this + #endif diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch new file mode 100644 index 0000000000..2d85e29005 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch @@ -0,0 +1,27 @@ +From 8290fd619582651334fbfdfe7be887d539ce0f2c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 23 Nov 2024 13:28:33 -0800 +Subject: [PATCH] Link with icu-uc to fix build with ICU-76 + +Fixes +https://bugzilla.mozilla.org/show_bug.cgi?id=1927380 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + js/moz.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/moz.configure b/js/moz.configure +index 593b93acee..2181dca34b 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu): + return enable_system_icu + + +-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu") ++system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu") + + + @depends(enable_system_icu_option) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch new file mode 100644 index 0000000000..9cdb9fe913 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch @@ -0,0 +1,42 @@ +From 93d586d712bf34c243c6174425c78d3ab274c6a0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 7 Jan 2025 15:17:16 -0800 +Subject: [PATCH] Recognise riscv64gc and riscv32gc as valid architectures + +Rust uses above for architecture in tuples + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + build/autoconf/config.sub | 2 +- + .../mozbuild/test/configure/test_toolchain_configure.py | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub +index 2c6a07ab3c..f7ee82380c 100755 +--- a/build/autoconf/config.sub ++++ b/build/autoconf/config.sub +@@ -1236,7 +1236,7 @@ case $cpu-$vendor in + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ +- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ ++ | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +index 1be0d02e54..a476d787b2 100644 +--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): + "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, + "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, + "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, ++ "riscv32gc-unknown-linux-gnu": little_endian ++ + {"__riscv": 1, "__riscv_xlen": 32}, ++ "riscv64gc-unknown-linux-gnu": little_endian ++ + {"__riscv": 1, "__riscv_xlen": 64}, + "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, + } + diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch new file mode 100644 index 0000000000..1900c17f74 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0013-Fix-build-error-with-musl.patch @@ -0,0 +1,30 @@ +From 0f903fa0be39e39083599306018fa7bd724dba9d Mon Sep 17 00:00:00 2001 +From: Ankur Tyagi +Date: Wed, 7 Jan 2026 20:26:53 +1300 +Subject: [PATCH] Fix build error with musl + +_Unwind_GetIP symbol is not implemented by musl, so use it only with libc. + +mozglue/misc/StackWalk.o: in function `unwind_callback(_Unwind_Context*, void*)': +| /usr/src/debug/mozjs-128/128.5.2/mozglue/misc/StackWalk.cpp:810:(.text._ZL15unwind_callbackP15_Unwind_ContextPv+0x4): undefined reference to `_Unwind_GetIP' + +Reference: https://github.com/OSSystems/meta-browser/commit/bb8662912354dae13634c0ec35c3803c344b1e72 +Upstream-Status: Inappropriate [musl-specific] +Signed-off-by: Ankur Tyagi +--- + mozglue/misc/StackWalk.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp +index d3d9208fdb..9f7155a4f7 100644 +--- a/mozglue/misc/StackWalk.cpp ++++ b/mozglue/misc/StackWalk.cpp +@@ -696,7 +696,7 @@ MFBT_API bool MozDescribeCodeAddress(void* aPC, + // + // Changes to to OS/Architecture support here should be reflected in + // build/moz.configure/memory.configure +-#elif HAVE_DLADDR && \ ++#elif defined(__GLIBC__) && HAVE_DLADDR && \ + (HAVE__UNWIND_BACKTRACE || MOZ_STACKWALK_SUPPORTS_LINUX || \ + MOZ_STACKWALK_SUPPORTS_MACOSX) + diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch deleted file mode 100644 index 564f423fb4..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 16 Dec 2024 05:49:57 +0000 -Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard - it's use to fix the build on qemuarmv5. - -Upstream-Status: Pending -Signed-off-by: Ross Burton ---- - js/src/jit/arm/Architecture-arm.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp -index d4c5026705..fc0455eaff 100644 ---- a/js/src/jit/arm/Architecture-arm.cpp -+++ b/js/src/jit/arm/Architecture-arm.cpp -@@ -528,9 +528,11 @@ void FlushICache(void* code, size_t size) { - - void FlushExecutionContext() { - #ifndef JS_SIMULATOR_ARM -+#if __ARM_ARCH >= 7 - // Ensure that any instructions already in the pipeline are discarded and - // reloaded from the icache. - asm volatile("isb\n" : : : "memory"); -+#endif - #else - // We assume the icache flushing routines on other platforms take care of this - #endif diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch deleted file mode 100644 index 3d5452ce4d..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 22 Sep 2023 22:59:56 +0000 -Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can - - not assume that its always available on musl, we do need to check for target - environment as well which could be musl or glibc. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - mozglue/misc/StackWalk.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp -index 18fd3464b0..d3d9208fdb 100644 ---- a/mozglue/misc/StackWalk.cpp -+++ b/mozglue/misc/StackWalk.cpp -@@ -50,7 +50,7 @@ using namespace mozilla; - # define HAVE___LIBC_STACK_END 0 - #endif - --#if (defined(linux) && \ -+#if (defined(linux) && defined(__GLIBC__) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE)) && \ - (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 deleted file mode 100644 index cb2dc66525..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch +++ /dev/null @@ -1,30 +0,0 @@ -Recognise riscv64gc and riscv32gc as valid architectures - -Rust uses above for architecture in tuples - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas - "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, - "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, - "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, -+ "riscv32gc-unknown-linux-gnu": little_endian -+ + {"__riscv": 1, "__riscv_xlen": 32}, -+ "riscv64gc-unknown-linux-gnu": little_endian -+ + {"__riscv": 1, "__riscv_xlen": 64}, - "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, - } - ---- a/build/autoconf/config.sub -+++ b/build/autoconf/config.sub -@@ -1236,7 +1236,7 @@ case $cpu-$vendor in - | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ - | pru \ - | pyramid \ -- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ -+ | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \ - | rl78 | romp | rs6000 | rx \ - | s390 | s390x \ - | score \ diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch deleted file mode 100644 index 67e23c5fcc..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 24 Oct 2021 22:32:50 -0700 -Subject: [PATCH] Add RISCV32 support - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - build/moz.configure/init.configure | 3 +++ - python/mozbuild/mozbuild/configure/constants.py | 2 ++ - .../mozbuild/test/configure/test_toolchain_configure.py | 1 + - 3 files changed, 6 insertions(+) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 97b9bab167..d9a5a2035d 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -594,6 +594,9 @@ def split_triplet(triplet, allow_wasi=False): - elif cpu.startswith("aarch64"): - canonical_cpu = "aarch64" - endianness = "little" -+ elif cpu in ("riscv32", "riscv32gc"): -+ canonical_cpu = "riscv32" -+ endianness = "little" - elif cpu in ("riscv64", "riscv64gc"): - canonical_cpu = "riscv64" - endianness = "little" -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index 25f43bb9f8..3335e69405 100644 ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -73,6 +73,7 @@ CPU_bitness = { - "mips64": 64, - "ppc": 32, - "ppc64": 64, -+ 'riscv32': 32, - "riscv64": 64, - "s390": 32, - "s390x": 64, -@@ -129,6 +130,7 @@ CPU_preprocessor_checks = OrderedDict( - ("m68k", "__m68k__"), - ("mips64", "__mips64"), - ("mips32", "__mips__"), -+ ("riscv32", "__riscv && __riscv_xlen == 32"), - ("riscv64", "__riscv && __riscv_xlen == 64"), - ("loongarch64", "__loongarch64"), - ("sh4", "__sh__"), -diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -index d438b68eb8..1be0d02e54 100644 ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): - "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, - "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, - "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, -+ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, - "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, - "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, - } diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb index ceb81d07e5..fbbe3749ba 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb @@ -8,14 +8,15 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ file://0004-use-asm-sgidefs.h.patch \ - file://riscv32.patch \ - file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ - file://0001-rewrite-cargo-host-linker-in-python3.patch \ - file://musl-disable-stackwalk.patch \ - file://0001-add-arm-to-list-of-mozinline.patch \ - file://armv5.patch \ - file://0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \ - file://riscv.patch \ + file://0005-Add-RISCV32-support.patch \ + file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0007-Rewrite-cargo-host-linker-in-python3.patch \ + file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \ + file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \ + file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \ + file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \ + file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \ + file://0013-Fix-build-error-with-musl.patch \ " SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f" -- cgit v1.2.3-54-g00ecf