commit 7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f
author Casey Smalley <casey.smalley@arm.com> Thu May 01 10:20:26 2025 +0100
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 29 10:05:50 2025 -0700
tree c324ae8c8ae2d5dc8d73d03bc7eff9a31016a76c
parent 4bd5bd8d51e43bbeebf75d495cd9d158bc304655

Update arm_control_flow_integrity to use bti+pac-ret

Following a similar change in chromium/src, mbranch-protection=standard
will now also enable Guarded Control Stack.

This has been changed to bti+pac until the time comes to enable gcs for
testing.

Change-Id: I45158353859da45feae121e8594b79a5fbbbe64a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/76068
Tested-by: Shahbaz Youssefi <syoussefi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index b405f51..cec2b68 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -53,6 +53,9 @@
         if (arm_control_flow_integrity == "standard") {
           cflags += [ "-mbranch-protection=standard" ]
           asmflags += [ "-mbranch-protection=standard" ]
+        } else if (arm_control_flow_integrity == "bti+pac") {
+          cflags += [ "-mbranch-protection=bti+pac-ret" ]
+          asmflags += [ "-mbranch-protection=bti+pac-ret" ]
         } else if (arm_control_flow_integrity == "pac") {
           cflags += [ "-mbranch-protection=pac-ret" ]
           asmflags += [ "-mbranch-protection=pac-ret" ]