StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable cfi for 32bit arch" am: 34d300ba76 am: 809e91cf12

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc18a5d82cc961ae132b081f27809f5ab0683cc0
This commit is contained in:
Cindy Zhou
2021-03-12 13:22:26 +00:00
committed by Automerger Merge Worker
parent a84d532ae5 809e91cf12
commit 87075e20e7
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/sanitize.go
View File

@@ -404,12 +404,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
s.Diag.Cfi = boolPtr(false)
}
// Also disable CFI for arm32 until b/35157333 is fixed.
if ctx.Arch().ArchType == android.Arm {
s.Cfi = boolPtr(false)
s.Diag.Cfi = boolPtr(false)
}
// HWASan requires AArch64 hardware feature (top-byte-ignore).
if ctx.Arch().ArchType != android.Arm64 {
s.Hwaddress = nil