From 121483bbbc3ead2442ba642aa0da18ce3fa958c1 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 14 Jun 2023 08:33:38 -0700 Subject: [PATCH] riscv64: enable Zbs. Cuttlefish still boots to homescreen, all instructions in the extension are actually seen to be in use, and the bionic tests still pass. Test: see above Change-Id: I429729a722cdd7b3bdf257cb7329ee151ec998a0 --- cc/config/riscv64_device.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/config/riscv64_device.go b/cc/config/riscv64_device.go index 77ee9774e..3bc1e69c3 100644 --- a/cc/config/riscv64_device.go +++ b/cc/config/riscv64_device.go @@ -29,14 +29,14 @@ var ( // A temporary fix for SExtWRemoval miscompilation bug. "-mllvm", "-riscv-disable-sextw-removal=true", - "-march=rv64gc_zba_zbb", + "-march=rv64gc_zba_zbb_zbs", } riscv64ArchVariantCflags = map[string][]string{} riscv64Ldflags = []string{ "-Wl,--hash-style=gnu", - "-march=rv64gc_zba_zbb", + "-march=rv64gc_zba_zbb_zbs", } riscv64Lldflags = append(riscv64Ldflags,