Merge "Temporarily disable shadow call stack for riscv64." am: 7d57090bb3 am: ff930db547 am: ec7f52be7a

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

Change-Id: Ie27c3e24ea96edeee0598bfa575994fe64acd52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes
2023-04-13 03:16:26 +00:00
committed by Automerger Merge Worker

View File

@@ -616,6 +616,10 @@ 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.