Skip to content

Commit b5ff3f4

Browse files
legendecasRafaelGSS
authored andcommitted
tools: include toolchain.gypi in abseil.gyp
This sets proper SIMD build flags for abseil on ia32. PR-URL: #58678 Fixes: #58569 Reviewed-By: Michaël Zasso <[email protected]>
1 parent 6e0ee39 commit b5ff3f4

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

tools/v8_gypfiles/abseil.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
'includes': ['toolchain.gypi'],
23
'targets': [
34
{
45
'target_name': 'abseil',

tools/v8_gypfiles/toolchain.gypi

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,16 @@
4040
'ubsan_vptr%': 0,
4141
'has_valgrind%': 0,
4242
'coverage%': 0,
43+
44+
# Toolchain settings.
4345
'v8_target_arch%': '<(target_arch)',
4446
'v8_host_byteorder%': '<!("<(python)" -c "import sys; print(sys.byteorder)")',
4547
'force_dynamic_crt%': 0,
4648

49+
# Enable control-flow integrity features, such as pointer authentication
50+
# for ARM64.
51+
'v8_control_flow_integrity%': 0,
52+
4753
# Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
4854
# registers d16-d31 in the generated code, both in the snapshot and for the
4955
# ARM target. Leaving the default value of 'false' will avoid the use of
@@ -98,10 +104,6 @@
98104
'gcmole%': 0,
99105
},
100106
'target_defaults': {
101-
'include_dirs': [
102-
'<(V8_ROOT)',
103-
'<(V8_ROOT)/include',
104-
],
105107
'cflags!': ['-Wall', '-Wextra'],
106108
'conditions': [
107109
['clang==0 and OS!="win"', {

tools/v8_gypfiles/v8.gyp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
},
3737
'includes': ['toolchain.gypi', 'features.gypi'],
3838
'target_defaults': {
39+
'include_dirs': [
40+
'<(V8_ROOT)',
41+
'<(V8_ROOT)/include',
42+
],
3943
'msvs_settings': {
4044
'VCCLCompilerTool': {
4145
'AdditionalOptions': ['/utf-8']

0 commit comments

Comments
 (0)