| commit | 8e8ef9fe665cff26b608a5d05b2c712cb0a1a4b2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 06 17:28:00 2022 +0000 |
| committer | Elliott Hughes <enh@google.com> | Mon Jun 06 20:40:47 2022 +0000 |
| tree | 3dad7c85f539a45af99a5779ca97fea1934bfe07 | |
| parent | c54158d3c78c715c6a3cf3f4744d293cf804e51b [diff] |
Revert "Disable BTI for now." This reverts commit c75994d6235a023df6942fddeaa34b2a66f2e5f6. Reason for revert: BTI shipped in S, and we're going to work on app compat outreach rather than regress this security feature. Bug: https://issuetracker.google.com/216395195 Bug: https://issuetracker.google.com/233339366 Change-Id: Ic7143d756907ceb574a686258751840ce62c920f Merged-In: Ic7143d756907ceb574a686258751840ce62c920f
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index dfe143f..66087e6 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go
@@ -33,9 +33,7 @@ }, "armv8-a-branchprot": []string{ "-march=armv8-a", - // Disable BTI until drm vendors stop using OS libraries as sources - // of gadgets (https://issuetracker.google.com/216395195). - "-mbranch-protection=pac-ret", + "-mbranch-protection=standard", }, "armv8-2a": []string{ "-march=armv8.2-a",