[PATCH 2/2] RISC-V: Fix requirement handling on Zhinx+{D,Q}

[Tsukasa OI]

This commit fixes how instructions are masked on Zhinx+Z{d,q}inx.
fcvt.h.d and fcvt.d.h require ((D&&Zfh)||(Zdinx&&Zhinx)) and
fcvt.h.q and fcvt.q.h require ((Q&&Zfh)||(Zqinx&&Zhinx)).

bfd/ChangeLog:

	* elfxx-riscv.c (riscv_multi_subset_supports): Fix feature gate
	on INSN_CLASS_{D,Q}_AND_ZFH_INX.
	(riscv_multi_subset_supports_ext): Fix feature gate diagnostics
	on INSN_CLASS_{D,Q}_AND_ZFH_INX.

gas/ChangeLog:

	* testsuite/gas/riscv/fp-zhinx-insns.d: Add Zqinx to -march
	for proper testing.
---
 bfd/elfxx-riscv.c                        | 30 ++++++++++++++++++++----
 gas/testsuite/gas/riscv/fp-zhinx-insns.d |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 5c2c616a760..39b68c92317 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -2370,15 +2370,17 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps,
       return riscv_subset_supports (rps, "zfh");
     case INSN_CLASS_ZFH_OR_ZHINX:
       return riscv_subset_supports (rps, "zfh")
-        || riscv_subset_supports (rps, "zhinx");
+	     || riscv_subset_supports (rps, "zhinx");
     case INSN_CLASS_D_AND_ZFH_INX:
       return (riscv_subset_supports (rps, "d")
 	      && riscv_subset_supports (rps, "zfh"))
-           || riscv_subset_supports (rps, "zhinx");
+	     || (riscv_subset_supports (rps, "zdinx")
+		 && riscv_subset_supports (rps, "zhinx"));
     case INSN_CLASS_Q_AND_ZFH_INX:
       return (riscv_subset_supports (rps, "q")
 	      && riscv_subset_supports (rps, "zfh"))
-           || riscv_subset_supports (rps, "zhinx");
+	     || (riscv_subset_supports (rps, "zqinx")
+		 && riscv_subset_supports (rps, "zhinx"));
     case INSN_CLASS_ZBA:
       return riscv_subset_supports (rps, "zba");
     case INSN_CLASS_ZBB:
@@ -2522,9 +2524,27 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps,
     case INSN_CLASS_ZFH_OR_ZHINX:
       return "zfh' or 'zhinx";
     case INSN_CLASS_D_AND_ZFH_INX:
-      return "('d' and 'zfh') or 'zhinx";
+      if (riscv_subset_supports (rps, "zfh"))
+	return "d";
+      else if (riscv_subset_supports (rps, "d"))
+	return "zfh";
+      else if (riscv_subset_supports (rps, "zhinx"))
+	return "zdinx";
+      else if (riscv_subset_supports (rps, "zdinx"))
+	return "zhinx";
+      else
+	return "zfh' and `d', or `zhinx' and `zdinx";
     case INSN_CLASS_Q_AND_ZFH_INX:
-      return "('q' and 'zfh') or 'zhinx";
+      if (riscv_subset_supports (rps, "zfh"))
+	return "q";
+      else if (riscv_subset_supports (rps, "q"))
+	return "zfh";
+      else if (riscv_subset_supports (rps, "zhinx"))
+	return "zqinx";
+      else if (riscv_subset_supports (rps, "zqinx"))
+	return "zhinx";
+      else
+	return "zfh' and `q', or `zhinx' and `zqinx";
     default:
       rps->error_handler
         (_("internal: unreachable INSN_CLASS_*"));
diff --git a/gas/testsuite/gas/riscv/fp-zhinx-insns.d b/gas/testsuite/gas/riscv/fp-zhinx-insns.d
index 6e1c40e65f5..2592d8c74e2 100644
--- a/gas/testsuite/gas/riscv/fp-zhinx-insns.d
+++ b/gas/testsuite/gas/riscv/fp-zhinx-insns.d
@@ -1,4 +1,4 @@
-#as: -march=rv64ima_zhinx
+#as: -march=rv64ima_zqinx_zhinx
 #source: fp-zhinx-insns.s
 #objdump: -dr
 
-- 
2.34.1