Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6
am: f2886e1913
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595746 Change-Id: I99ee9f64a53b231238100f9d1a95f49138fd6178 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user