2 files changed, 56 insertions, 39 deletions
diff --git a/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch b/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch
deleted file mode 100644
index a3e4acb02c3a..000000000000
--- a/net-libs/nodejs/files/nodejs-16.0.0-v8_lto.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ea694e2b138d2f991989e09fc0e964fec3587b5f Mon Sep 17 00:00:00 2001
-From: Jesse Chan <jc@linux.com>
-Date: Thu, 22 Apr 2021 19:41:09 +0800
-Subject: [PATCH] tools: disable LTO for "v8_cppgc_shared" target
-
-"PushAllRegistersAndIterateStack" is implemented in assembly and
-called from "stack.cc" via 'extern "C"'. [1]
-
-However, LTO does not work well with symbol usage from assembly. [2]
-
-This change workarounds the issue by disabling LTO for the target.
-
-With GCC 10 and "./configure --enable-lto", compilation succeeds
-after this change.
-
-[1] v8/v8@c10863153
-[2] https://gcc.gnu.org/wiki/LinkTimeOptimizationFAQ#Symbol_usage_from_assembly_language
-
-Refs: #35957
-Refs: #38335
-Signed-off-by: Jesse Chan <jc@linux.com>
----
- tools/v8_gypfiles/v8.gyp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
-index ccb5984f47d..377e12d1fdc 100644
---- a/tools/v8_gypfiles/v8.gyp
-+++ b/tools/v8_gypfiles/v8.gyp
-@@ -1378,6 +1378,9 @@
-           '<(V8_ROOT)/src/heap/base/worklist.h',
-         ],
-         'conditions': [
-+          ['enable_lto=="true"', {
-+            'cflags_cc': [ '-fno-lto' ],
-+          }],
-           ['clang or OS!="win"', {
-             'conditions': [
-               ['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
diff --git a/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch b/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch
new file mode 100644
index 000000000000..724541a870db
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch
@@ -0,0 +1,56 @@
+From 7c8a60851c459ea18afbfc54bfc8cf7394ea56c3 Mon Sep 17 00:00:00 2001
+From: Antoine du Hamel <duhamelantoine1995@gmail.com>
+Date: Thu, 6 May 2021 12:00:07 +0200
+Subject: [PATCH] test,repl: fix tests when inspector is disabled
+
+Fixes: https://github.com/nodejs/node/issues/38558
+
+PR-URL: https://github.com/nodejs/node/pull/38564
+Reviewed-By: Anna Henningsen <anna@addaleax.net>
+Reviewed-By: James M Snell <jasnell@gmail.com>
+Reviewed-By: Rich Trott <rtrott@gmail.com>
+---
+ test/parallel/test-repl-history-navigation.js | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/parallel/test-repl-history-navigation.js b/test/parallel/test-repl-history-navigation.js
+index df4f0390a69c..527cf235bddd 100644
+--- a/test/parallel/test-repl-history-navigation.js
++++ b/test/parallel/test-repl-history-navigation.js
+@@ -559,14 +559,14 @@ const tests = [
+     env: { NODE_REPL_HISTORY: defaultHistoryPath },
+     test: ['const util = {}', ENTER,
+            'ut', RIGHT, ENTER],
+-    expected: common.hasIntl && common.hasCrypto ? [
++    expected: [
+       prompt, ...'const util = {}',
+       'undefined\n',
+-      prompt, ...'ut', ' // il', '\n// {}',
+-      'il', '\n// {}',
++      prompt, ...'ut', ...(prev ? [' // il', '\n// {}',
++                                   'il', '\n// {}'] : [' // il', 'il']),
+       '{}\n',
+       prompt,
+-    ] : [],
++    ],
+     clean: false
+   },
+   {
+@@ -577,7 +577,7 @@ const tests = [
+       'globalThis.util = {}', ENTER,
+       'ut', RIGHT, ENTER,
+       'Reflect.defineProperty(globalThis, "util", utilDesc)', ENTER],
+-    expected: common.hasIntl && common.hasCrypto ? [
++    expected: [
+       prompt, ...'const utilDesc = ' +
+       'Reflect.getOwnPropertyDescriptor(globalThis, "util")',
+       'undefined\n',
+@@ -588,7 +588,7 @@ const tests = [
+       prompt, ...'Reflect.defineProperty(globalThis, "util", utilDesc)',
+       'true\n',
+       prompt,
+-    ] : [],
++    ],
+     clean: false
+   },
+ ];