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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I853848ed2877765da887880dd5fc7901b64ade72
This commit is contained in:
Cindy Zhou
2021-03-12 13:04:52 +00:00
committed by Automerger Merge Worker

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