diff --git a/patches/node/.patches b/patches/node/.patches index d1df090471f8..e5114a032fb6 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -10,9 +10,7 @@ refactor_allow_embedder_overriding_of_internal_fs_calls.patch chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch chore_add_context_to_context_aware_module_prevention.patch chore_read_nobrowserglobals_from_global_not_process.patch -enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch fix_handle_boringssl_and_openssl_incompatibilities.patch -fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch src_allow_embedders_to_provide_a_custom_pageallocator_to.patch fix_crypto_tests_to_run_with_bssl.patch fix_account_for_debugger_agent_race_condition.patch @@ -42,3 +40,4 @@ process_fix_hang_after_note_exit_3521.patch 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 +fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch diff --git a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch deleted file mode 100644 index d6ef9a68a08c..000000000000 --- a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Apthorp -Date: Tue, 10 Dec 2019 15:02:21 -0800 -Subject: enable 31 bit smis on 64bit arch and ptr compression - -This aligns with the defaults set on the Chromium build. Without this, native -node modules will have different (wrong) ideas about how v8 structs are laid -out in memory on 64-bit machines, and will summarily fail to work. - -diff --git a/common.gypi b/common.gypi -index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..7ffd577817d3c6ae7164dd3945479aedcee9640e 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -64,7 +64,7 @@ - # options but default values are required here as this file is also used by - # node-gyp to build addons. - 'v8_enable_pointer_compression%': 0, -- 'v8_enable_31bit_smis_on_64bit_arch%': 0, -+ 'v8_enable_31bit_smis_on_64bit_arch%': 1, - - # Disable V8 untrusted code mitigations. - # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations -@@ -133,6 +133,9 @@ - 'v8_enable_pointer_compression': 0, - 'v8_enable_31bit_smis_on_64bit_arch': 0, - }], -+ ['target_arch == "arm64" or target_arch == "x64"', { -+ 'v8_enable_pointer_compression': 1, -+ }], - ['target_arch in "ppc64 s390x"', { - 'v8_enable_backtrace': 1, - }], 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 index b8578ea1afcc..5716a2d57dc7 100644 --- 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 @@ -6,26 +6,19 @@ 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 7ffd577817d3c6ae7164dd3945479aedcee9640e..6674f9f9b8880c40db579664fa40f62ad0139368 100644 +index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..fd4e0b38eb6ecf81b23186ec663499d1e685fdf8 100644 --- a/common.gypi +++ b/common.gypi -@@ -65,6 +65,7 @@ - # node-gyp to build addons. - 'v8_enable_pointer_compression%': 0, - 'v8_enable_31bit_smis_on_64bit_arch%': 1, -+ 'v8_enable_reverse_jsargs%': 1, - - # Disable V8 untrusted code mitigations. - # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations -@@ -82,6 +83,7 @@ +@@ -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, -@@ -401,6 +403,9 @@ +@@ -398,6 +400,9 @@ ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', { 'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'], }],