Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6 am: f2886e1913 am: 3dcc091676 am: bf18f0320e

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

Change-Id: If7e89deb64d17235833fd88e7fbcc2cdec0c366e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aditya Kumar
2023-07-28 09:47:05 +00:00
committed by Automerger Merge Worker

View File

@@ -671,12 +671,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