diff --git a/patches/node/.patches b/patches/node/.patches index e9e80036004f..6ac58f432512 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -38,7 +38,6 @@ feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch fix_preserve_proper_method_names_as-is_in_error_stack.patch macos_avoid_posix_spawnp_cwd_bug_3597.patch src_update_importmoduledynamically.patch -fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch json_parse_errors_made_user-friendly.patch support_v8_sandboxed_pointers.patch build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch diff --git a/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch index 3592cdfe1d6b..2e2347736916 100644 --- a/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch +++ b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch @@ -7,19 +7,19 @@ Subject: build: ensure native module compilation fails if not using a new This should not be upstreamed, it is a quality-of-life patch for downstream module builders. diff --git a/common.gypi b/common.gypi -index ae9889508ed0f3f24f2a888ba8650ccdce72fa47..946b80af9cda553d0ee5328701f2b6c1f8a08e9d 100644 +index a80b57fbba17b5025351ef41dd83f62832bbd781..8441a5270212af7e4643e6b4ee100a22f8e6f51c 100644 --- a/common.gypi +++ b/common.gypi -@@ -85,6 +85,8 @@ - - 'v8_enable_reverse_jsargs%': 1, +@@ -83,6 +83,8 @@ + # TODO(refack): make v8-perfetto happen + 'v8_use_perfetto': 0, + 'using_electron_config_gypi%': 0, + ##### end V8 defaults ##### # When building native modules using 'npm install' with the system npm, -@@ -290,6 +292,7 @@ +@@ -288,6 +290,7 @@ 'V8_DEPRECATION_WARNINGS', 'V8_IMMINENT_DEPRECATION_WARNINGS', '_GLIBCXX_USE_CXX11_ABI=1', @@ -27,7 +27,7 @@ index ae9889508ed0f3f24f2a888ba8650ccdce72fa47..946b80af9cda553d0ee5328701f2b6c1 ], # Forcibly disable -Werror. We support a wide range of compilers, it's -@@ -397,6 +400,11 @@ +@@ -395,6 +398,11 @@ }], ], }], diff --git a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch index 37838af68b9c..4b508b6cc09e 100644 --- a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch +++ b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch @@ -8,7 +8,7 @@ Aligns common.gypi with the current build flag state of //v8. Specifically enables `V8_ENABLE_SANDBOX`, `V8_SANDBOXED_POINTERS`, `V8_COMPRESS_POINTERS` and `V8_COMPRESS_POINTERS_IN_SHARED_CAGE`. diff --git a/common.gypi b/common.gypi -index 7224823f0df04da7a7626839f2205057d95155d2..ae9889508ed0f3f24f2a888ba8650ccdce72fa47 100644 +index fcd55b95b44050e4d88eeb0d3100ba6e6a5d5e78..a80b57fbba17b5025351ef41dd83f62832bbd781 100644 --- a/common.gypi +++ b/common.gypi @@ -65,6 +65,7 @@ @@ -19,7 +19,7 @@ index 7224823f0df04da7a7626839f2205057d95155d2..ae9889508ed0f3f24f2a888ba8650ccd # Disable V8 untrusted code mitigations. # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations -@@ -134,6 +135,7 @@ +@@ -132,6 +133,7 @@ ['target_arch in "arm ia32 mips mipsel ppc"', { 'v8_enable_pointer_compression': 0, 'v8_enable_31bit_smis_on_64bit_arch': 0, @@ -27,7 +27,7 @@ index 7224823f0df04da7a7626839f2205057d95155d2..ae9889508ed0f3f24f2a888ba8650ccd }], ['target_arch in "ppc64 s390x"', { 'v8_enable_backtrace': 1, -@@ -398,9 +400,14 @@ +@@ -396,9 +398,14 @@ ['v8_enable_pointer_compression == 1', { 'defines': [ 'V8_COMPRESS_POINTERS', diff --git a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch deleted file mode 100644 index 71a48f9f0401..000000000000 --- a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Attard -Date: Thu, 17 Sep 2020 14:18:30 -0700 -Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi - -This can be removed once node upgrades V8 and inevitably has to do this exact same thing. Also hi node people if you are looking at this. - -diff --git a/common.gypi b/common.gypi -index fcd55b95b44050e4d88eeb0d3100ba6e6a5d5e78..7224823f0df04da7a7626839f2205057d95155d2 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -82,6 +82,8 @@ - # TODO(refack): make v8-perfetto happen - 'v8_use_perfetto': 0, - -+ 'v8_enable_reverse_jsargs%': 1, -+ - ##### end V8 defaults ##### - - # When building native modules using 'npm install' with the system npm, -@@ -402,6 +404,9 @@ - ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', { - 'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'], - }], -+ ['v8_enable_reverse_jsargs == 1', { -+ 'defines': ['V8_REVERSE_JSARGS'], -+ }], - ['OS == "win"', { - 'defines': [ - 'WIN32',