diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 7da9d377120..ee756aab694 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -2918,8 +2918,8 @@ riscv_pass_aggregate_in_fpr_pair_p (const_tree type,
 
   if ((n_old != n_new) && (warned == 0))
     {
-      warning (0, "ABI for flattened struct with zero-length bit-fields "
-	       "changed in GCC 10");
+      warning (OPT_Wpsabi, "ABI for flattened struct with zero-length "
+			   "bit-fields changed in GCC 10");
       warned = 1;
     }
 
@@ -2960,8 +2960,8 @@ riscv_pass_aggregate_in_fpr_and_gpr_p (const_tree type,
 	   && (num_int_old != num_int_new || num_float_old != num_float_new)))
       && (warned == 0))
     {
-      warning (0, "ABI for flattened struct with zero-length bit-fields "
-	       "changed in GCC 10");
+      warning (OPT_Wpsabi, "ABI for flattened struct with zero-length "
+			   "bit-fields changed in GCC 10");
       warned = 1;
     }