From 76d088eb74115ea14f774d1940557ca3047e1ebb Mon Sep 17 00:00:00 2001
From: Joel Sing <joel@sing.id.au>
Date: Wed, 10 Sep 2025 01:00:22 +1000
Subject: [PATCH] cmd/internal/obj/riscv: remove ACFLWSP/ACFSWSP and
 ACFLW/ACFSW

These are RV32-only instructions that will not be implemented.

Updates #71105

Change-Id: Ie386fe36e56f1151bb8756088dd79804584317c0
Reviewed-on: https://go-review.googlesource.com/c/go/+/702395
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Meng Zhuo <mengzhuo1203@gmail.com>
Reviewed-by: Mark Ryan <markdryan@rivosinc.com>
Reviewed-by: Mark Freeman <markfreeman@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
---
 src/cmd/internal/obj/riscv/anames.go | 4 ----
 src/cmd/internal/obj/riscv/cpu.go    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/cmd/internal/obj/riscv/anames.go b/src/cmd/internal/obj/riscv/anames.go
index a8807fc7a8..6c48e2f7de 100644
--- a/src/cmd/internal/obj/riscv/anames.go
+++ b/src/cmd/internal/obj/riscv/anames.go
@@ -195,20 +195,16 @@ var Anames = []string{
 	"FLTQ",
 	"FCLASSQ",
 	"CLWSP",
-	"CFLWSP",
 	"CLDSP",
 	"CFLDSP",
 	"CSWSP",
 	"CSDSP",
-	"CFSWSP",
 	"CFSDSP",
 	"CLW",
 	"CLD",
-	"CFLW",
 	"CFLD",
 	"CSW",
 	"CSD",
-	"CFSW",
 	"CFSD",
 	"CJ",
 	"CJR",
diff --git a/src/cmd/internal/obj/riscv/cpu.go b/src/cmd/internal/obj/riscv/cpu.go
index 305ef061e3..60174a0b3a 100644
--- a/src/cmd/internal/obj/riscv/cpu.go
+++ b/src/cmd/internal/obj/riscv/cpu.go
@@ -588,22 +588,18 @@ const (
 
 	// 26.3.1: Compressed Stack-Pointer-Based Loads and Stores
 	ACLWSP
-	ACFLWSP
 	ACLDSP
 	ACFLDSP
 	ACSWSP
 	ACSDSP
-	ACFSWSP
 	ACFSDSP
 
 	// 26.3.2: Compressed Register-Based Loads and Stores
 	ACLW
 	ACLD
-	ACFLW
 	ACFLD
 	ACSW
 	ACSD
-	ACFSW
 	ACFSD
 
 	// 26.4: Compressed Control Transfer Instructions
-- 
2.52.0