Merge "[RISC-V] rv64gc_zbb for Android" am: 13ca1a9207

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

Change-Id: I7bf748dc1d7f0961e63098a2628b9a628319ae9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cc/config/riscv64_device.go b/cc/config/riscv64_device.go
index 35c57f9..70e9fe4 100644
--- a/cc/config/riscv64_device.go
+++ b/cc/config/riscv64_device.go
@@ -28,6 +28,7 @@
 		"-fno-emulated-tls",
 		// For -fsanitize=shadow-call-stack.
 		"-ffixed-x18",
+		"-march=rv64gc_zbb",
 	}
 
 	riscv64ArchVariantCflags = map[string][]string{}
@@ -36,6 +37,7 @@
 		"-Wl,--hash-style=gnu",
 		// For -fsanitize=shadow-call-stack.
 		"-ffixed-x18",
+		"-march=rv64gc_zbb",
 	}
 
 	riscv64Lldflags = append(riscv64Ldflags,