nodejs: Fix support for NetBSD/aarch64. Bump revision.

- Fix malformed preprocessor directive: ``#ifdef FOO && BAR''
- Use V8_OS_NETBSD instead of defined(__NetBSD__) consistently where appropriate

XXX
Unfortunately, nodejs does not work for aarch64eb yet.
We need to add big-endian support to built-in assembler.

3 files changed, 9 insertions, 8 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index b0d2c47b572..f54211565f0 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.212 2021/04/22 17:33:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.213 2021/04/24 06:30:28 rin Exp $
 
 DISTNAME=	node-v14.16.1
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.xz
 
 USE_LANGUAGES=	c gnu++14
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index e919fe84b8c..424a988aa93 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.195 2021/04/22 15:52:25 ryoon Exp $
+$NetBSD: distinfo,v 1.196 2021/04/24 06:30:28 rin Exp $
 
 SHA1 (node-v14.16.1.tar.xz) = 3b8001e12cdae8b0e0fb2c1f7a8eb7f314d30cfc
 RMD160 (node-v14.16.1.tar.xz) = cf91d50c5833f8f20799bb2bbdfc9152207c50d0
@@ -11,7 +11,7 @@ SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa
 SHA1 (patch-deps_v8_src_base_atomicops.h) = 05b1f62850c3d4a9a8e94a5263be1c4267cf566d
 SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = b47025f33d2991275bbcd15dbabb28900afab0e1
 SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
-SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 84300d917c172e6211a00b76bfb44ee25465ee00
+SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = f99d9bee3ce452dda41c9b2943ee16cebcbd0af3
 SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
 SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b
 SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
diff --git a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
index c0c40059de0..5d3aea3d7dc 100644
--- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
+++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.6 2020/08/05 21:49:18 maya Exp $
+$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.7 2021/04/24 06:30:28 rin Exp $
 
 Use sysconf(_SC_THREAD_STACK_MIN) instead of PTHREAD_STACK_MIN.
 Cast explicitly.
@@ -6,14 +6,14 @@ Cast explicitly.
 Avoid using a random hint, some low numbers cause spurious ENOMEM on netbsd
 (PR port-arm/55533)
 
---- deps/v8/src/base/platform/platform-posix.cc.orig	2020-07-20 22:18:45.000000000 +0000
-+++ deps/v8/src/base/platform/platform-posix.cc
+--- deps/v8/src/base/platform/platform-posix.cc.orig	2021-04-07 04:42:14.000000000 +0900
++++ deps/v8/src/base/platform/platform-posix.cc	2021-04-24 07:39:15.080548801 +0900
 @@ -323,6 +323,10 @@ void* OS::GetRandomMmapAddr() {
  #endif
  #endif
  #endif
 +
-+#ifdef __NetBSD__ && V8_TARGET_ARCH_ARM64
++#if V8_OS_NETBSD && V8_TARGET_ARCH_ARM64
 +  raw_addr = 0;
 +#endif
    return reinterpret_cast<void*>(raw_addr);
@@ -32,7 +32,7 @@ Avoid using a random hint, some low numbers cause spurious ENOMEM on netbsd
      : data_(new PlatformData),
        stack_size_(options.stack_size()),
        start_semaphore_(nullptr) {
-+#if defined(__NetBSD__)
++#if V8_OS_NETBSD
 +  if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < sysconf(_SC_THREAD_STACK_MIN)) {
 +    stack_size_ = sysconf(_SC_THREAD_STACK_MIN);
 +#else