diff --git a/src/internal/abi/abi_generic.go b/src/internal/abi/abi_generic.go
index d5803e70d2b..76ef2e28986 100644
--- a/src/internal/abi/abi_generic.go
+++ b/src/internal/abi/abi_generic.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !goexperiment.regabiargs && !amd64 && !arm64 && !ppc64 && !ppc64le
+//go:build !goexperiment.regabiargs && !amd64 && !arm64 && !ppc64 && !ppc64le && !riscv64
 
 package abi
 
diff --git a/src/internal/abi/abi_riscv64.go b/src/internal/abi/abi_riscv64.go
index 16568205773..2bcd9d6db21 100644
--- a/src/internal/abi/abi_riscv64.go
+++ b/src/internal/abi/abi_riscv64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build goexperiment.regabiargs
-
 package abi
 
 const (
diff --git a/src/internal/buildcfg/exp.go b/src/internal/buildcfg/exp.go
index 8531aac9080..71f8f5648d4 100644
--- a/src/internal/buildcfg/exp.go
+++ b/src/internal/buildcfg/exp.go
@@ -62,11 +62,9 @@ func ParseGOEXPERIMENT(goos, goarch, goexp string) (*ExperimentFlags, error) {
 	// always on.
 	var regabiSupported, regabiAlwaysOn bool
 	switch goarch {
-	case "amd64", "arm64", "ppc64le", "ppc64":
+	case "amd64", "arm64", "ppc64le", "ppc64", "riscv64":
 		regabiAlwaysOn = true
 		regabiSupported = true
-	case "riscv64":
-		regabiSupported = true
 	}
 
 	baseline := goexperiment.Flags{