Merge "Reapply "Enable CFI for riscv64"" into main

This commit is contained in:
Sami Tolvanen
2023-09-19 16:11:26 +00:00
committed by Gerrit Code Review

View File

@@ -679,12 +679,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
s.Integer_overflow = nil
}
// TODO(b/254713216): CFI doesn't work for riscv64 yet because LTO doesn't work.
if ctx.Arch().ArchType == android.Riscv64 {
s.Cfi = nil
s.Diag.Cfi = nil
}
// Disable CFI for musl
if ctx.toolchain().Musl() {
s.Cfi = nil