Merge branch 'nodejs-assert' into 'master'

Fix nodejs crash assertion, update opts, add to CI

See merge request redox-os/redox!1929
This commit is contained in:
Jeremy Soller 2026-02-20 05:48:56 -07:00
commit e12432e19f
3 changed files with 20 additions and 5 deletions

View File

@ -128,6 +128,7 @@ netutils = {}
neverball = {}
nghttp2 = {}
nginx = {}
nodejs-21 = {}
nushell = {}
onefetch = {}
openjazz = {}

View File

@ -1,4 +1,4 @@
#TODO page fault
#TODO node is working but ld.so crashing with npm
[source]
tar = "https://nodejs.org/dist/v21.7.3/node-v21.7.3.tar.xz"
blake3 = "95a56db4f9729b2f8384ab58ccb2ec0c41da05991f7400ef97bd76748d77870b"
@ -58,10 +58,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
--shared-nghttp3
--shared-openssl
--shared-zlib
--disable-shared-readonly-heap
--without-node-snapshot
--without-node-code-cache
--v8-lite-mode
--without-inspector
# TODO: Find a way to separate host and target flags instead?
# --shared-zlib-includes="${COOKBOOK_TOOLCHAIN}/include"
--shared-openssl-includes="${COOKBOOK_SYSROOT}/include"

View File

@ -203,6 +203,23 @@ diff -ruwN source/deps/v8/src/base/platform/platform-posix.cc source-new/deps/v8
flags |= MAP_NORESERVE;
#endif // !V8_OS_AIX && !V8_OS_FREEBSD && !V8_OS_QNX
#if V8_OS_QNX
@@ -565,14 +569,8 @@
// MADV_FREE_REUSABLE sometimes fails, so fall back to MADV_DONTNEED.
ret = madvise(address, size, MADV_DONTNEED);
}
-#elif defined(_AIX) || defined(V8_OS_SOLARIS)
- int ret = madvise(reinterpret_cast<caddr_t>(address), size, MADV_FREE);
- if (ret != 0 && errno == ENOSYS) {
- return true; // madvise is not available on all systems.
- }
- if (ret != 0 && errno == EINVAL) {
- ret = madvise(reinterpret_cast<caddr_t>(address), size, MADV_DONTNEED);
- }
+#elif defined(_AIX) || defined(V8_OS_SOLARIS) || defined(V8_OS_REDOX)
+ int ret = 0; // madvise is not available on all systems.
#else
int ret = madvise(address, size, MADV_DONTNEED);
#endif
diff -ruwN source/deps/v8/src/base/platform/platform-redox.cc source-new/deps/v8/src/base/platform/platform-redox.cc
--- source/deps/v8/src/base/platform/platform-redox.cc 1970-01-01 07:00:00.000000000 +0700
+++ source-new/deps/v8/src/base/platform/platform-redox.cc 2025-10-10 15:23:18.233737033 +0700