Merge "Reapply "Enable CFI for riscv64"" into main am: 95ad0a9226 am: 588514f0be am: 45af8ea092 am: 9cf8c7d72b

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

Change-Id: Ib2be71cd6ae4b49bc68425734a6823a6d0d922fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sami Tolvanen
2023-09-19 19:22:08 +00:00
committed by Automerger Merge Worker

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