From cc750892297fbad15411de60c1732c0f046f3ce0 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Tue, 28 Mar 2023 20:59:36 +0000 Subject: [PATCH] Revert "[RISC-V] rv64gc_zbb for Android" This reverts commit 9838acffddbc6ed1ff97ec0fcc037e424002e7a1. Reason for revert: b/274947458 Broke CI. Will reland with QEMU options once the host image is fixed. Change-Id: I6ad847cde2a291b3dd5b92314b2011744de50883 --- cc/config/riscv64_device.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cc/config/riscv64_device.go b/cc/config/riscv64_device.go index 70e9fe434..35c57f90f 100644 --- a/cc/config/riscv64_device.go +++ b/cc/config/riscv64_device.go @@ -28,7 +28,6 @@ var ( "-fno-emulated-tls", // For -fsanitize=shadow-call-stack. "-ffixed-x18", - "-march=rv64gc_zbb", } riscv64ArchVariantCflags = map[string][]string{} @@ -37,7 +36,6 @@ var ( "-Wl,--hash-style=gnu", // For -fsanitize=shadow-call-stack. "-ffixed-x18", - "-march=rv64gc_zbb", } riscv64Lldflags = append(riscv64Ldflags,