From 733d872254a59c3415ff58992b42fde001cfdcf3 Mon Sep 17 00:00:00 2001
From: Chengzhong Wu <cwu631@bloomberg.net>
Date: Wed, 11 Jun 2025 15:04:21 +0100
Subject: [PATCH] tools: include toolchain.gypi in abseil.gyp

This sets proper SIMD build flags for abseil on ia32.
---
 tools/v8_gypfiles/abseil.gyp     |  1 +
 tools/v8_gypfiles/toolchain.gypi | 10 ++++++----
 tools/v8_gypfiles/v8.gyp         |  4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/v8_gypfiles/abseil.gyp b/tools/v8_gypfiles/abseil.gyp
index 2f71382d04fe52..f46629beae4c47 100644
--- a/tools/v8_gypfiles/abseil.gyp
+++ b/tools/v8_gypfiles/abseil.gyp
@@ -1,4 +1,5 @@
 {
+  'includes': ['toolchain.gypi'],
   'targets': [
     {
       'target_name': 'abseil',
diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
index a3462d2bb33e1a..1c44c94b2ca946 100644
--- a/tools/v8_gypfiles/toolchain.gypi
+++ b/tools/v8_gypfiles/toolchain.gypi
@@ -40,10 +40,16 @@
     'ubsan_vptr%': 0,
     'has_valgrind%': 0,
     'coverage%': 0,
+
+    # Toolchain settings.
     'v8_target_arch%': '<(target_arch)',
     'v8_host_byteorder%': '<!("<(python)" -c "import sys; print(sys.byteorder)")',
     'force_dynamic_crt%': 0,
 
+    # Enable control-flow integrity features, such as pointer authentication
+    # for ARM64.
+    'v8_control_flow_integrity%': 0,
+
     # Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
     # registers d16-d31 in the generated code, both in the snapshot and for the
     # ARM target. Leaving the default value of 'false' will avoid the use of
@@ -98,10 +104,6 @@
     'gcmole%': 0,
   },
   'target_defaults': {
-    'include_dirs': [
-      '<(V8_ROOT)',
-      '<(V8_ROOT)/include',
-    ],
     'cflags!': ['-Wall', '-Wextra'],
     'conditions': [
       ['clang==0 and OS!="win"', {
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 3ea5564d5463a2..4134ef5c1810f3 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -36,6 +36,10 @@
   },
   'includes': ['toolchain.gypi', 'features.gypi'],
   'target_defaults': {
+    'include_dirs': [
+      '<(V8_ROOT)',
+      '<(V8_ROOT)/include',
+    ],
     'msvs_settings': {
       'VCCLCompilerTool': {
         'AdditionalOptions': ['/utf-8']