From 2966967606532deac3dde80fcdbce301eecc19d1 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dingli@iscas.ac.cn>
Date: Mon, 17 Mar 2025 16:28:35 +0800
Subject: [PATCH] Backport JDK-8343555: RISC-V: make some verified (on
 hardware) extension options diagnostic


diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 85aaa3d239d..2ee0b4b9421 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -101,11 +101,11 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseRVA20U64, true, "Use RVA20U64 profile")                       \
   product(bool, UseRVA22U64, false, EXPERIMENTAL, "Use RVA22U64 profile")        \
   product(bool, UseRVA23U64, false, EXPERIMENTAL, "Use RVA23U64 profile")        \
-  product(bool, UseRVC, false, "Use RVC instructions")                           \
-  product(bool, UseRVV, false, "Use RVV instructions")                           \
-  product(bool, UseZba, false, "Use Zba instructions")                           \
-  product(bool, UseZbb, false, "Use Zbb instructions")                           \
-  product(bool, UseZbs, false, "Use Zbs instructions")                           \
+  product(bool, UseRVC, false, DIAGNOSTIC, "Use RVC instructions")               \
+  product(bool, UseRVV, false, DIAGNOSTIC, "Use RVV instructions")               \
+  product(bool, UseZba, false, DIAGNOSTIC, "Use Zba instructions")               \
+  product(bool, UseZbb, false, DIAGNOSTIC, "Use Zbb instructions")               \
+  product(bool, UseZbs, false, DIAGNOSTIC, "Use Zbs instructions")               \
   product(bool, UseZic64b, false, EXPERIMENTAL, "Use Zic64b instructions")       \
   product(bool, UseZicbom, false, EXPERIMENTAL, "Use Zicbom instructions")       \
   product(bool, UseZicbop, false, EXPERIMENTAL, "Use Zicbop instructions")       \
-- 
2.34.1