Skip to content

Commit f0730e3

Browse files
targosnodejs-ci
authored andcommitted
tools: update v8 gypfiles
until fe6bd3019d47c8522e2cad2bb52fd82dce906485
1 parent 225c0f1 commit f0730e3

File tree

4 files changed

+75
-5
lines changed

4 files changed

+75
-5
lines changed

tools/v8_gypfiles/features.gypi

+13
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,13 @@
196196
# Use switch-based dispatch if this is false.
197197
'v8_enable_regexp_interpreter_threaded_dispatch%': 1,
198198

199+
# Disable all snapshot compression.
200+
'v8_enable_snapshot_compression%': 1,
201+
202+
# Enable control-flow integrity features, such as pointer authentication
203+
# for ARM64.
204+
'v8_control_flow_integrity%': 0,
205+
199206
# Variables from v8.gni
200207

201208
# Enable ECMAScript Internationalization API. Enabling this feature will
@@ -325,6 +332,12 @@
325332
['v8_enable_regexp_interpreter_threaded_dispatch==1', {
326333
'defines': ['V8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH',],
327334
}],
335+
['v8_enable_snapshot_compression==1', {
336+
'defines': ['V8_SNAPSHOT_COMPRESSION',],
337+
}],
338+
['v8_control_flow_integrity==1', {
339+
'defines': ['V8_ENABLE_CONTROL_FLOW_INTEGRITY',],
340+
}],
328341
], # conditions
329342
'defines': [
330343
'V8_EMBEDDED_BUILTINS',

tools/v8_gypfiles/inspector.gypi

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
'<(inspector_protocol_path)/lib/base_string_adapter_h.template',
1111
'<(inspector_protocol_path)/lib/DispatcherBase_cpp.template',
1212
'<(inspector_protocol_path)/lib/DispatcherBase_h.template',
13-
'<(inspector_protocol_path)/lib/ErrorSupport_cpp.template',
14-
'<(inspector_protocol_path)/lib/ErrorSupport_h.template',
1513
'<(inspector_protocol_path)/lib/Forward_h.template',
1614
'<(inspector_protocol_path)/lib/FrontendChannel_h.template',
1715
'<(inspector_protocol_path)/lib/Object_cpp.template',

tools/v8_gypfiles/toolchain.gypi

+5
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,11 @@
301301
'defines': [
302302
'V8_TARGET_ARCH_ARM64',
303303
],
304+
'conditions': [
305+
['v8_control_flow_integrity==1', {
306+
'cflags': [ '-mbranch-protection=pac-ret' ],
307+
}],
308+
],
304309
}],
305310
['v8_target_arch=="s390x"', {
306311
'defines': [

tools/v8_gypfiles/v8.gyp

+57-3
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,15 @@
733733
['want_separate_host_toolset', {
734734
'toolsets': ['host', 'target'],
735735
}],
736+
['v8_control_flow_integrity==1', {
737+
'sources': [
738+
'<(V8_ROOT)/src/execution/arm64/pointer-authentication-arm64.h',
739+
],
740+
}, {
741+
'sources': [
742+
'<(V8_ROOT)/src/execution/pointer-authentication-dummy.h',
743+
],
744+
}],
736745
['v8_target_arch=="ia32"', {
737746
'sources': [ ### gcmole(arch:ia32) ###
738747
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_current_cpu == \\"x86.*?sources \+= ")',
@@ -1608,12 +1617,57 @@
16081617
{
16091618
'target_name': 'v8_zlib',
16101619
'type': 'static_library',
1620+
'conditions': [
1621+
['want_separate_host_toolset', {
1622+
'toolsets': ['host', 'target'],
1623+
}],
1624+
],
16111625
'direct_dependent_settings': {
1612-
'include_dirs': [ '<(V8_ROOT)/third_party/zlib' ],
1626+
'include_dirs': [
1627+
'<(V8_ROOT)/third_party/zlib',
1628+
'<(V8_ROOT)/third_party/zlib/google',
1629+
],
16131630
},
16141631
'defines': [ 'ZLIB_IMPLEMENTATION' ],
1615-
'include_dirs': [ '<(V8_ROOT)/third_party/zlib' ],
1616-
'sources': [ '<(V8_ROOT)/third_party/zlib/adler32.c' ],
1632+
'include_dirs': [
1633+
'<(V8_ROOT)/third_party/zlib',
1634+
'<(V8_ROOT)/third_party/zlib/google',
1635+
],
1636+
'sources': [
1637+
'<(V8_ROOT)/third_party/zlib/adler32.c',
1638+
'<(V8_ROOT)/third_party/zlib/chromeconf.h',
1639+
'<(V8_ROOT)/third_party/zlib/compress.c',
1640+
'<(V8_ROOT)/third_party/zlib/contrib/optimizations/insert_string.h',
1641+
'<(V8_ROOT)/third_party/zlib/contrib/optimizations/insert_string.h',
1642+
'<(V8_ROOT)/third_party/zlib/cpu_features.c',
1643+
'<(V8_ROOT)/third_party/zlib/cpu_features.h',
1644+
'<(V8_ROOT)/third_party/zlib/crc32.c',
1645+
'<(V8_ROOT)/third_party/zlib/crc32.h',
1646+
'<(V8_ROOT)/third_party/zlib/deflate.c',
1647+
'<(V8_ROOT)/third_party/zlib/deflate.h',
1648+
'<(V8_ROOT)/third_party/zlib/gzclose.c',
1649+
'<(V8_ROOT)/third_party/zlib/gzguts.h',
1650+
'<(V8_ROOT)/third_party/zlib/gzlib.c',
1651+
'<(V8_ROOT)/third_party/zlib/gzread.c',
1652+
'<(V8_ROOT)/third_party/zlib/gzwrite.c',
1653+
'<(V8_ROOT)/third_party/zlib/infback.c',
1654+
'<(V8_ROOT)/third_party/zlib/inffast.c',
1655+
'<(V8_ROOT)/third_party/zlib/inffast.h',
1656+
'<(V8_ROOT)/third_party/zlib/inffixed.h',
1657+
'<(V8_ROOT)/third_party/zlib/inflate.c',
1658+
'<(V8_ROOT)/third_party/zlib/inflate.h',
1659+
'<(V8_ROOT)/third_party/zlib/inftrees.c',
1660+
'<(V8_ROOT)/third_party/zlib/inftrees.h',
1661+
'<(V8_ROOT)/third_party/zlib/trees.c',
1662+
'<(V8_ROOT)/third_party/zlib/trees.h',
1663+
'<(V8_ROOT)/third_party/zlib/uncompr.c',
1664+
'<(V8_ROOT)/third_party/zlib/zconf.h',
1665+
'<(V8_ROOT)/third_party/zlib/zlib.h',
1666+
'<(V8_ROOT)/third_party/zlib/zutil.c',
1667+
'<(V8_ROOT)/third_party/zlib/zutil.h',
1668+
'<(V8_ROOT)/third_party/zlib/google/compression_utils_portable.cc',
1669+
'<(V8_ROOT)/third_party/zlib/google/compression_utils_portable.h',
1670+
],
16171671
}, # v8_zlib
16181672
],
16191673
}

0 commit comments

Comments
 (0)