diff --git a/node.gyp b/node.gyp index 6397deea9af..0496f75fea5 100644 --- a/node.gyp +++ b/node.gyp @@ -1332,7 +1332,7 @@ ], 'conditions': [ [ 'node_shared_simdutf=="false"', { - 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host' ], + 'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ], }], [ 'node_shared_libuv=="false"', { 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], diff --git a/node.gypi b/node.gypi index 308d614ab02..02a7d626712 100644 --- a/node.gypi +++ b/node.gypi @@ -226,7 +226,7 @@ }], [ 'node_shared_simdutf=="false"', { - 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf' ], + 'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf' ], }], [ 'node_shared_brotli=="false"', { diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi index 582fcee3901..0214bec80dd 100644 --- a/tools/v8_gypfiles/features.gypi +++ b/tools/v8_gypfiles/features.gypi @@ -87,6 +87,12 @@ }, { 'v8_enable_private_mapping_fork_optimization': 0, }], + + ['OS in "aix os400"', { + 'v8_enable_leaptiering': 0, + }, { + 'v8_enable_leaptiering': 1, + }], ], # Variables from BUILD.gn @@ -483,6 +489,9 @@ ['v8_enable_extensible_ro_snapshot==1', { 'defines': ['V8_ENABLE_EXTENSIBLE_RO_SNAPSHOT',], }], + ['v8_enable_leaptiering==1', { + 'defines': ['V8_ENABLE_LEAPTIERING',], + }], ['v8_enable_precise_zone_stats==1', { 'defines': ['V8_ENABLE_PRECISE_ZONE_STATS',], }], diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index 937f3f51976..2d0221e2fa0 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -716,7 +716,10 @@ }], # Temporary refs: https://github.com/nodejs/node/pull/23801 ['v8_enable_handle_zapping==1', { - 'defines': ['ENABLE_HANDLE_ZAPPING',], + 'defines': [ + 'ENABLE_LOCAL_HANDLE_ZAPPING', + 'ENABLE_GLOBAL_HANDLE_ZAPPING', + ], }], ], diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index c3724fe7a5b..360b80f93e3 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -1056,6 +1056,8 @@ 'v8_zlib', 'v8_pch', 'fp16', + 'highway', + 'simdutf', 'abseil.gyp:abseil', ], 'includes': ['inspector.gypi'], @@ -2260,5 +2262,69 @@ ], }, }, # fp16 + { + 'target_name': 'highway', + 'type': 'static_library', + 'toolsets': ['host', 'target'], + 'variables': { + 'HIGHWAY_ROOT': '../../deps/v8/third_party/highway', + }, + 'direct_dependent_settings': { + 'include_dirs': [ + '<(HIGHWAY_ROOT)/src', + ], + 'conditions': [ + ['v8_target_arch=="ia32"', { + 'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',], + }], + ['v8_target_arch=="arm64"', { + 'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',], + }], + ['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', { + 'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',], + }], + ['v8_target_arch=="s390x"', { + 'defines': ['HWY_BROKEN_EMU128=0',], + }], + ['OS == "aix"', { + 'defines': ['HWY_BROKEN_EMU128=0',], + }], + ['v8_target_arch=="arm" and arm_version==7', { + 'defines': ['HWY_BROKEN_EMU128=0',], + }], + ], + }, + 'include_dirs': [ + '<(HIGHWAY_ROOT)/src', + ], + 'conditions': [ + ['v8_target_arch=="ia32"', { + 'defines': ['HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)',], + }], + ['v8_target_arch=="arm64"', { + 'defines': ['HWY_BROKEN_TARGETS=HWY_ALL_SVE',], + }], + ['v8_target_arch=="ppc64" or v8_target_arch=="s390x"', { + 'defines': ['TOOLCHAIN_MISS_ASM_HWCAP_H',], + }], + ], + 'sources': [ + '