From c75994d6235a023df6942fddeaa34b2a66f2e5f6 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 2 Feb 2022 14:45:41 -0800
Subject: [PATCH] Disable BTI for now.

Bug: https://issuetracker.google.com/216395195
Test: readelf -aW libc.so | grep PROPERTY
Change-Id: I4d157cbe5bf5b54cb7d3c4efe8fb74d4f72af6f3
---
 cc/config/arm64_device.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 2d6bcb89d..979c82525 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -33,7 +33,9 @@ var (
 		},
 		"armv8-a-branchprot": []string{
 			"-march=armv8-a",
-			"-mbranch-protection=standard",
+			// Disable BTI until drm vendors stop using OS libraries as sources
+			// of gadgets (https://issuetracker.google.com/216395195).
+			"-mbranch-protection=pac-ret",
 		},
 		"armv8-2a": []string{
 			"-march=armv8.2-a",