commit 111d68053b825846926b13865cfbcf97b51839c8
author AdityaK <appujee@google.com> Mon Jul 17 14:45:17 2023 -0700
committer Aditya Kumar <appujee@google.com> Mon Jul 17 22:43:44 2023 +0000
tree 3f1a263d93fdd64476dbc7e2d73f64e9d3376b12
parent adb892c5393a6b1a3a40984fec14e3f51b102571

Enable scs for riscv64

https://github.com/google/android-riscv64/issues/106

Bug: b/277909695

Change-Id: I2ea0d41fd9dc43b3fefb748d10694917034ab586

cc/sanitize.go

diff --git a/cc/sanitize.go b/cc/sanitize.go
index 62e31d1..626005b 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -646,10 +646,6 @@
 	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.