Merge "Enable scs for riscv64" into main

This commit is contained in:
Aditya Kumar 2023-07-18 18:26:42 +00:00 committed by Gerrit Code Review
commit a4755647b0

View file

@ -646,10 +646,6 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
if (ctx.Arch().ArchType != android.Arm64 && ctx.Arch().ArchType != android.Riscv64) || !ctx.toolchain().Bionic() {
s.Scs = nil
}
// ...but temporarily globally disabled on riscv64 (http://b/277909695).
if ctx.Arch().ArchType == android.Riscv64 {
s.Scs = nil
}
// Memtag_heap is only implemented on AArch64.
// Memtag ABI is Android specific for now, so disable for host.