mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
mozjs: add recipe for mozjs-128
mozjs-128 is the current esr release based on firefox 128 Add a new recipe and keep mozjs-115 as its still supported and used by polkit - Remove two backported patches - Remove a (hopefully) unneeded patches for musl (build for qemuarm/musl succeeded) - Add dependency for cbindgen-native Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
Khem Raj
@@ -0,0 +1,31 @@
|
||||
From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 1 Oct 2021 13:00:24 +0200
|
||||
Subject: [PATCH] Cargo.toml: do not abort on panic
|
||||
|
||||
OE's rust is configured to unwind, and this setting clashes with it/
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
Cargo.toml | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index a4248187be..eed8964b3a 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -67,13 +67,11 @@ opt-level = 1
|
||||
rpath = false
|
||||
lto = false
|
||||
debug-assertions = true
|
||||
-panic = "abort"
|
||||
|
||||
[profile.release]
|
||||
opt-level = 2
|
||||
rpath = false
|
||||
debug-assertions = false
|
||||
-panic = "abort"
|
||||
|
||||
# Optimize build dependencies, because bindgen and proc macros / style
|
||||
# compilation take more to run than to build otherwise.
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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)
|
||||
@@ -0,0 +1,31 @@
|
||||
From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
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 <kai.kang@windriver.com>
|
||||
---
|
||||
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")
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Thu, 7 Oct 2021 12:44:18 +0200
|
||||
Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize'
|
||||
names
|
||||
|
||||
The outcome is that processed names no longer match our custom rust
|
||||
target definitions, and the build fails.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
|
||||
---
|
||||
build/moz.configure/init.configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/build/moz.configure/init.configure
|
||||
+++ b/build/moz.configure/init.configure
|
||||
@@ -647,24 +647,7 @@ def help_host_target(help, host, target)
|
||||
|
||||
def config_sub(shell, triplet):
|
||||
config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
|
||||
- # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
|
||||
- # munge those before and after calling config.sub.
|
||||
- suffix = None
|
||||
- munging = {
|
||||
- "-windows-msvc": "-mingw32",
|
||||
- "-windows-gnu": "-mingw32",
|
||||
- }
|
||||
- for check_suffix, replacement in munging.items():
|
||||
- if triplet.endswith(check_suffix):
|
||||
- suffix = check_suffix
|
||||
- triplet = triplet[: -len(suffix)] + replacement
|
||||
- break
|
||||
- result = check_cmd_output(shell, config_sub, triplet).strip()
|
||||
- if suffix:
|
||||
- assert result.endswith(replacement)
|
||||
- result = result[: -len(replacement)] + suffix
|
||||
- return result
|
||||
-
|
||||
+ return triplet
|
||||
|
||||
@depends("--host", shell)
|
||||
@checking("for host system type", lambda h: h.alias)
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
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 <changqing.li@windriver.com>
|
||||
---
|
||||
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)
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
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 <changqing.li@windriver.com>
|
||||
---
|
||||
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")
|
||||
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 1 Oct 2021 13:01:10 +0200
|
||||
Subject: [PATCH] moz.configure: do not look for llvm-objdump
|
||||
|
||||
This avoid dragging in a dependency that isn't even needed
|
||||
for js builds.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
moz.configure | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/moz.configure b/moz.configure
|
||||
index 804b9a375a..402e79e3b3 100755
|
||||
--- a/moz.configure
|
||||
+++ b/moz.configure
|
||||
@@ -390,15 +390,15 @@ def plain_llvm_or_prefixed(name, llvm_name=None):
|
||||
return plain_llvm_or_prefixed
|
||||
|
||||
|
||||
-llvm_objdump = check_prog(
|
||||
- "LLVM_OBJDUMP",
|
||||
- llvm_tool("llvm-objdump"),
|
||||
- what="llvm-objdump",
|
||||
- when="--enable-compile-environment",
|
||||
- paths=clang_search_path,
|
||||
-)
|
||||
-
|
||||
-add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
|
||||
+#llvm_objdump = check_prog(
|
||||
+# "LLVM_OBJDUMP",
|
||||
+# llvm_tool("llvm-objdump"),
|
||||
+# what="llvm-objdump",
|
||||
+# when="--enable-compile-environment",
|
||||
+# paths=clang_search_path,
|
||||
+#)
|
||||
+#
|
||||
+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
|
||||
|
||||
|
||||
def validate_readelf(path):
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 1 Oct 2021 13:02:17 +0200
|
||||
Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
|
||||
|
||||
OE is using custom targets and so this is bound to fail.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
build/moz.configure/rust.configure | 34 ++----------------------------
|
||||
1 file changed, 2 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
|
||||
index acac34ec05..ff3b8fc0fd 100644
|
||||
--- a/build/moz.configure/rust.configure
|
||||
+++ b/build/moz.configure/rust.configure
|
||||
@@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
|
||||
def rust_host_triple(
|
||||
rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target
|
||||
):
|
||||
- rustc_target = detect_rustc_target(
|
||||
- host, compiler_info, arm_target, rust_supported_targets
|
||||
- )
|
||||
- if rustc_target != rustc_host:
|
||||
- if host.alias == rustc_target:
|
||||
- configure_host = host.alias
|
||||
- else:
|
||||
- configure_host = "{}/{}".format(host.alias, rustc_target)
|
||||
- die(
|
||||
- dedent(
|
||||
- """\
|
||||
- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
|
||||
-
|
||||
- You can solve this by:
|
||||
- * Set your configure host to match the rust compiler host by editing your
|
||||
- mozconfig and adding "ac_add_options --host={rustc}".
|
||||
- * Or, install the rust toolchain for {configure}, if supported, by running
|
||||
- "rustup default stable-{rustc_target}"
|
||||
- """.format(
|
||||
- rustc=rustc_host,
|
||||
- configure=configure_host,
|
||||
- rustc_target=rustc_target,
|
||||
- )
|
||||
- )
|
||||
- )
|
||||
- assert_rust_compile(host, rustc_target, rustc)
|
||||
- return rustc_target
|
||||
+ return rustc_host
|
||||
|
||||
|
||||
@depends(
|
||||
@@ -522,11 +496,7 @@ def rust_host_triple(
|
||||
def rust_target_triple(
|
||||
rustc, target, compiler_info, rust_supported_targets, arm_target
|
||||
):
|
||||
- rustc_target = detect_rustc_target(
|
||||
- target, compiler_info, arm_target, rust_supported_targets
|
||||
- )
|
||||
- assert_rust_compile(target, rustc_target, rustc)
|
||||
- return rustc_target
|
||||
+ return target.alias
|
||||
|
||||
|
||||
set_config("RUST_TARGET", rust_target_triple)
|
||||
@@ -0,0 +1,37 @@
|
||||
From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <amccurdy@gmail.com>
|
||||
Date: Sat, 30 Apr 2016 15:29:06 -0700
|
||||
Subject: [PATCH] use <asm/sgidefs.h>
|
||||
|
||||
Build fix for MIPS with musl libc
|
||||
|
||||
The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
|
||||
but not by musl. Regardless of the libc, the kernel headers provide
|
||||
<asm/sgidefs.h> which provides the same definitions, so use that
|
||||
instead.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
[Vincent:
|
||||
Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
mfbt/RandomNum.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp
|
||||
index 96de5d4055..2cfb2e10ee 100644
|
||||
--- a/mfbt/RandomNum.cpp
|
||||
+++ b/mfbt/RandomNum.cpp
|
||||
@@ -53,7 +53,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer,
|
||||
# elif defined(__s390__)
|
||||
# define GETRANDOM_NR 349
|
||||
# elif defined(__mips__)
|
||||
-# include <sgidefs.h>
|
||||
+# include <asm/sgidefs.h>
|
||||
# if _MIPS_SIM == _MIPS_SIM_ABI32
|
||||
# define GETRANDOM_NR 4353
|
||||
# elif _MIPS_SIM == _MIPS_SIM_ABI64
|
||||
@@ -0,0 +1,28 @@
|
||||
From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
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 <ross.burton@arm.com>
|
||||
---
|
||||
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
|
||||
@@ -0,0 +1,27 @@
|
||||
From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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))
|
||||
@@ -0,0 +1,59 @@
|
||||
From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 24 Oct 2021 22:32:50 -0700
|
||||
Subject: [PATCH] Add RISCV32 support
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
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},
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++"
|
||||
HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
|
||||
LICENSE = "MPL-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
|
||||
|
||||
SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
|
||||
file://0001-Cargo.toml-do-not-abort-on-panic.patch \
|
||||
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 \
|
||||
"
|
||||
SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/firefox-${PV}"
|
||||
|
||||
inherit pkgconfig perlnative python3native rust
|
||||
|
||||
DEPENDS += "zlib cbindgen-native python3 icu"
|
||||
DEPENDS:remove:mipsarch = "icu"
|
||||
DEPENDS:remove:powerpc:toolchain-clang = "icu"
|
||||
|
||||
B = "${WORKDIR}/build"
|
||||
|
||||
export PYTHONPATH = "${S}/build:\
|
||||
${S}/third_party/python/PyYAML/lib3:\
|
||||
${S}/testing/mozbase/mozfile:\
|
||||
${S}/python/mozboot:\
|
||||
${S}/third_party/python/distro:\
|
||||
${S}/testing/mozbase/mozinfo:\
|
||||
${S}/config:\
|
||||
${S}/testing/mozbase/manifestparser:\
|
||||
${S}/third_party/python/pytoml:\
|
||||
${S}/testing/mozbase/mozprocess:\
|
||||
${S}/third_party/python/six:\
|
||||
${S}/python/mozbuild:\
|
||||
${S}/python/mozbuild/mozbuild:\
|
||||
${S}/python/mach:\
|
||||
${S}/third_party/python/jsmin:\
|
||||
${S}/python/mozversioncontrol"
|
||||
|
||||
export HOST_CC = "${BUILD_CC}"
|
||||
export HOST_CXX = "${BUILD_CXX}"
|
||||
export HOST_CFLAGS = "${BUILD_CFLAGS}"
|
||||
export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}"
|
||||
export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}"
|
||||
|
||||
export AS = "${CC}"
|
||||
|
||||
export RUSTFLAGS
|
||||
|
||||
JIT ?= ""
|
||||
JIT:mipsarch = "--disable-jit"
|
||||
ICU ?= "--with-system-icu"
|
||||
ICU:mipsarch = ""
|
||||
ICU:powerpc:toolchain-clang = ""
|
||||
|
||||
LDFLAGS:append:riscv32 = " -latomic"
|
||||
|
||||
do_configure() {
|
||||
cd ${B}
|
||||
python3 ${S}/configure.py \
|
||||
--enable-project=js \
|
||||
--target=${RUST_HOST_SYS} \
|
||||
--host=${BUILD_SYS} \
|
||||
--prefix=${prefix} \
|
||||
--libdir=${libdir} \
|
||||
--disable-jemalloc \
|
||||
--disable-strip \
|
||||
${JIT} \
|
||||
${ICU}
|
||||
}
|
||||
do_configure[cleandirs] += "${B}"
|
||||
|
||||
do_install() {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
|
||||
inherit multilib_script multilib_header
|
||||
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}"
|
||||
MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config"
|
||||
|
||||
do_install:append() {
|
||||
oe_multilib_header mozjs-${MAJ_VER}/js-config.h
|
||||
sed -e 's@${STAGING_DIR_HOST}@@g' \
|
||||
-i ${D}${bindir}/js${MAJ_VER}-config
|
||||
rm -f ${D}${libdir}/libjs_static.ajs
|
||||
}
|
||||
|
||||
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
||||
PACKAGES =+ "lib${BPN}"
|
||||
FILES:lib${BPN} += "${libdir}/lib*"
|
||||
Reference in New Issue
Block a user