CVS commit: pkgsrc/lang/nodejs

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Apr  1 18:41:02 UTC 2022

Modified Files:
        pkgsrc/lang/nodejs: Makefile distinfo
Added Files:
        pkgsrc/lang/nodejs/patches: patch-deps_v8_src_heap_code-range.cc

Log Message:
nodejs: disable "near code ranges" on NetBSD/evbarm-aarch64 for now

It results in mmap(2) errors of the PR kern/55533 variety.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.209 -r1.210 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.228 pkgsrc/lang/nodejs/Makefile:1.229
--- pkgsrc/lang/nodejs/Makefile:1.228   Fri Apr  1 15:40:09 2022
+++ pkgsrc/lang/nodejs/Makefile Fri Apr  1 18:41:02 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.228 2022/04/01 15:40:09 tnn Exp $
+# $NetBSD: Makefile,v 1.229 2022/04/01 18:41:02 tnn Exp $
 
 DISTNAME=      node-v16.14.2
+PKGREVISION=   1
 EXTRACT_SUFX=  .tar.xz
 
 USE_LANGUAGES= c gnu++14

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.209 pkgsrc/lang/nodejs/distinfo:1.210
--- pkgsrc/lang/nodejs/distinfo:1.209   Wed Mar 30 06:52:33 2022
+++ pkgsrc/lang/nodejs/distinfo Fri Apr  1 18:41:02 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.209 2022/03/30 06:52:33 adam Exp $
+$NetBSD: distinfo,v 1.210 2022/04/01 18:41:02 tnn Exp $
 
 BLAKE2s (node-v16.14.2.tar.xz) = e32e3e3de0c413fa7d67a2dd5fe89268c0283c47e632274889b6fc82aaea031c
 SHA512 (node-v16.14.2.tar.xz) = b97274f6e0d63f19e01497c43af36e6561f019e7b0b5b4f6ea19d0fbe2cb4d3c514c06f49e237d1e327936db03c3f437ae0d0b2f830a35f1b7c3a723fbe2a1be
@@ -15,6 +15,7 @@ SHA1 (patch-deps_v8_src_base_strings.h) 
 SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b
 SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
 SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
+SHA1 (patch-deps_v8_src_heap_code-range.cc) = dd240fd2f884bca7753d107919fd7d1e162235f0
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-node.gyp) = 0c2e5ccae623a7b730490baf8d509fa550b63e03
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc:1.1
--- /dev/null   Fri Apr  1 18:41:02 2022
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_heap_code-range.cc     Fri Apr  1 18:41:02 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-deps_v8_src_heap_code-range.cc,v 1.1 2022/04/01 18:41:02 tnn Exp $
+
+nodejs: disable "near code ranges" on NetBSD/evbarm-aarch64 for now.
+It results in mmap(2) errors of the PR kern/55533 variety.
+
+--- deps/v8/src/heap/code-range.cc.orig        2022-03-17 21:59:26.000000000 +0000
++++ deps/v8/src/heap/code-range.cc
+@@ -33,7 +33,11 @@ Address CodeRangeAddressHint::GetAddress
+   base::MutexGuard guard(&mutex_);
+   auto it = recently_freed_.find(code_range_size);
+   if (it == recently_freed_.end() || it->second.empty()) {
++#if V8_OS_NETBSD && V8_TARGET_ARCH_ARM64
++    return 0;
++#else
+     return FUNCTION_ADDR(&FunctionInStaticBinaryForAddressHint);
++#endif
+   }
+   Address result = it->second.back();
+   it->second.pop_back();