diff options
| author | 2023-04-13 03:16:26 +0000 | |
|---|---|---|
| committer | 2023-04-13 03:16:26 +0000 | |
| commit | dfd4dc66a3f4844e80968ae26cde61ef24d9d34c (patch) | |
| tree | 6509b5795b7295d263a9a1b88c02f9f0aabed115 | |
| parent | 9824682b1ba7fa20fe73c09a2bfd72d4c8cf57e6 (diff) | |
| parent | ec7f52be7a24e75ed3863cb2a019269725ba05b1 (diff) | |
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>
| -rw-r--r-- | cc/sanitize.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index c478e58f9..4601ee612 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -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. |