5555valid_mips_float_abi = ('soft' , 'hard' )
5656valid_intl_modes = ('none' , 'small-icu' , 'full-icu' , 'system-icu' )
5757icu_versions = json .loads ((tools_path / 'icu' / 'icu_versions.json' ).read_text (encoding = 'utf-8' ))
58- maglev_enabled_architectures = ('x64' , 'arm' , 'arm64' , 's390x' )
58+ maglev_enabled_architectures = ('x64' , 'arm' , 'arm64' , 'ppc64' , ' s390x' )
5959
6060# builtins may be removed later if they have been disabled by options
6161shareable_builtins = {'undici/undici' : 'deps/undici/undici.js' ,
@@ -1818,7 +1818,7 @@ def configure_node_lib_files(o):
18181818 o ['variables' ]['node_library_files' ] = SearchFiles ('lib' , 'js' )
18191819
18201820def configure_node_cctest_sources (o ):
1821- o ['variables' ]['node_cctest_sources' ] = [ 'src/node_snapshot_stub.cc' ] + \
1821+ o ['variables' ]['node_cctest_sources' ] = [] + \
18221822 SearchFiles ('test/cctest' , 'cc' ) + \
18231823 SearchFiles ('test/cctest' , 'h' )
18241824
@@ -1886,10 +1886,6 @@ def configure_node(o):
18861886 o ['variables' ]['arm_fpu' ] = options .arm_fpu or 'neon'
18871887
18881888 if options .node_snapshot_main is not None :
1889- if options .shared :
1890- # This should be possible to fix, but we will need to refactor the
1891- # libnode target to avoid building it twice.
1892- error ('--node-snapshot-main is incompatible with --shared' )
18931889 if options .without_node_snapshot :
18941890 error ('--node-snapshot-main is incompatible with ' +
18951891 '--without-node-snapshot' )
@@ -1900,17 +1896,15 @@ def configure_node(o):
19001896 if options .without_node_snapshot or options .node_builtin_modules_path :
19011897 o ['variables' ]['node_use_node_snapshot' ] = 'false'
19021898 else :
1903- o ['variables' ]['node_use_node_snapshot' ] = b (
1904- not cross_compiling and not options .shared )
1899+ o ['variables' ]['node_use_node_snapshot' ] = b (not cross_compiling )
19051900
19061901 # Do not use code cache when Node.js is built for collecting coverage of itself, this allows more
19071902 # precise coverage for the JS built-ins.
19081903 if options .without_node_code_cache or options .without_node_snapshot or options .node_builtin_modules_path or options .coverage :
19091904 o ['variables' ]['node_use_node_code_cache' ] = 'false'
19101905 else :
19111906 # TODO(refack): fix this when implementing embedded code-cache when cross-compiling.
1912- o ['variables' ]['node_use_node_code_cache' ] = b (
1913- not cross_compiling and not options .shared )
1907+ o ['variables' ]['node_use_node_code_cache' ] = b (not cross_compiling )
19141908
19151909 if options .write_snapshot_as_array_literals is not None :
19161910 o ['variables' ]['node_write_snapshot_as_array_literals' ] = b (options .write_snapshot_as_array_literals )
@@ -2175,7 +2169,7 @@ def configure_v8(o, configs):
21752169 o ['variables' ]['v8_promise_internal_field_count' ] = 1 # Add internal field to promises for async hooks.
21762170 o ['variables' ]['v8_use_siphash' ] = 0 if options .without_siphash else 1
21772171 o ['variables' ]['v8_enable_maglev' ] = B (not options .v8_disable_maglev and
2178- flavor != ' zos' and
2172+ flavor not in ( 'aix' , 'os400' , ' zos') and
21792173 o ['variables' ]['target_arch' ] in maglev_enabled_architectures )
21802174 o ['variables' ]['v8_enable_pointer_compression' ] = 1 if options .enable_pointer_compression else 0
21812175 # Using the sandbox requires always allocating array buffer backing stores in the sandbox.
0 commit comments