completely remove rva23s64

3 files changed, 1 insertions, 89 deletions

diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
index a85a894e42c..d81c4c329b3 100644
--- a/compiler/rustc_codegen_llvm/src/llvm_util.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
@@ -278,11 +278,7 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea
             None
         }
         // Filter out features that are not supported by the current LLVM version
-        ("riscv32" | "riscv64", "zacas" | "rva23s64" | "rva23u64" | "sha" | "ssnpm" | "supm")
-            if get_version().0 < 20 =>
-        {
-            None
-        }
+        ("riscv32" | "riscv64", "zacas" | "rva23u64" | "supm") if get_version().0 < 20 => None,
         (
             "s390x",
             "message-security-assist-extension12"
diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs
index 434f6a840b6..0729c44bc91 100644
--- a/compiler/rustc_target/src/target_features.rs
+++ b/compiler/rustc_target/src/target_features.rs
@@ -598,62 +598,6 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
     ("m", Stable, &[]),
     ("relax", Unstable(sym::riscv_target_feature), &[]),
     (
-        "rva23s64",
-        Unstable(sym::riscv_target_feature),
-        &[
-            "m",
-            "a",
-            "f",
-            "d",
-            "c",
-            "b",
-            "v",
-            "zicsr",
-            "zicntr",
-            "zihpm",
-            "ziccif",
-            "ziccrse",
-            "ziccamoa",
-            "zicclsm",
-            "zic64b",
-            "za64rs",
-            "zihintpause",
-            "zba",
-            "zbb",
-            "zbs",
-            "zicbom",
-            "zicbop",
-            "zicboz",
-            "zfhmin",
-            "zkt",
-            "zvfhmin",
-            "zvbb",
-            "zvkt",
-            "zihintntl",
-            "zicond",
-            "zimop",
-            "zcmop",
-            "zcb",
-            "zfa",
-            "zawrs",
-            "svbare",
-            "svade",
-            "ssccptr",
-            "sstvecd",
-            "sstvala",
-            "sscounterenw",
-            "svpbmt",
-            "svinval",
-            "svnapot",
-            "sstc",
-            "sscofpmf",
-            "ssnpm",
-            "ssu64xl",
-            "sha",
-            "supm",
-        ],
-    ),
-    (
         "rva23u64",
         Unstable(sym::riscv_target_feature),
         &[
@@ -695,21 +639,7 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
             "supm",
         ],
     ),
-    ("sha", Unstable(sym::riscv_target_feature), &[]),
-    ("ssccptr", Unstable(sym::riscv_target_feature), &[]),
-    ("sscofpmf", Unstable(sym::riscv_target_feature), &[]),
-    ("sscounterenw", Unstable(sym::riscv_target_feature), &[]),
-    ("ssnpm", Unstable(sym::riscv_target_feature), &[]),
-    ("sstc", Unstable(sym::riscv_target_feature), &[]),
-    ("sstvala", Unstable(sym::riscv_target_feature), &[]),
-    ("sstvecd", Unstable(sym::riscv_target_feature), &[]),
-    ("ssu64xl", Unstable(sym::riscv_target_feature), &[]),
     ("supm", Unstable(sym::riscv_target_feature), &[]),
-    ("svade", Unstable(sym::riscv_target_feature), &[]),
-    ("svbare", Unstable(sym::riscv_target_feature), &[]),
-    ("svinval", Unstable(sym::riscv_target_feature), &[]),
-    ("svnapot", Unstable(sym::riscv_target_feature), &[]),
-    ("svpbmt", Unstable(sym::riscv_target_feature), &[]),
     ("unaligned-scalar-mem", Unstable(sym::riscv_target_feature), &[]),
     ("unaligned-vector-mem", Unstable(sym::riscv_target_feature), &[]),
     ("v", Unstable(sym::riscv_target_feature), &["zvl128b", "zve64d"]),
diff --git a/tests/ui/check-cfg/target_feature.stderr b/tests/ui/check-cfg/target_feature.stderr
index a484fb0e5f0..218755a01f7 100644
--- a/tests/ui/check-cfg/target_feature.stderr
+++ b/tests/ui/check-cfg/target_feature.stderr
@@ -241,7 +241,6 @@ LL |     cfg!(target_feature = "_UNEXPECTED_VALUE");
 `relax`
 `relaxed-simd`
 `rtm`
-`rva23s64`
 `rva23u64`
 `sb`
 `scq`
@@ -294,27 +293,17 @@ LL |     cfg!(target_feature = "_UNEXPECTED_VALUE");
 `soft-float`
 `spe`
 `ssbs`
-`ssccptr`
-`sscofpmf`
-`sscounterenw`
 `sse`
 `sse2`
 `sse3`
 `sse4.1`
 `sse4.2`
 `sse4a`
-`ssnpm`
 `ssse3`
-`sstc`
-`sstvala`
-`sstvecd`
-`ssu64xl`
 `ssve-fp8dot2`
 `ssve-fp8dot4`
 `ssve-fp8fma`
 `supm`
-`svade`
-`svbare`
 `sve`
 `sve-b16b16`
 `sve2`
@@ -323,9 +312,6 @@ LL |     cfg!(target_feature = "_UNEXPECTED_VALUE");
 `sve2-sha3`
 `sve2-sm4`
 `sve2p1`
-`svinval`
-`svnapot`
-`svpbmt`
 `tail-call`
 `tbm`
 `thumb-mode`