From: Tsukasa OI <research_trasio@irq.a4lg.com>
Date: Sat, 10 Sep 2022 08:32:17 +0000 (+0000)
Subject: RISC-V: Remove RV32EF conflict
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=092a151a38c1bd87f25d1d03d4089a25b1bfbbc8;p=binutils-gdb.git

RISC-V: Remove RV32EF conflict

Despite that the RISC-V ISA Manual version 2.2 prohibited "RV32EF", later
versions beginning with the version 20190608-Base-Ratified removed this
restriction.  Because the 'E' extension is still a draft, the author chose
to *just* remove the conflict (not checking the ISA version).

Note that, because RV32E is only used with a soft-float calling convention,
there's no valid official ABI for RV32EF.  It means, even if we can assemble
a program with -march=rv32ef -mabi=ilp32e, floating-point registers are kept
in an unmanaged state (outside ABI management).

The purpose of this commit is to suppress unnecessary errors while parsing
an ISA string and/or disassembling, not to allow hard-float with RVE.

bfd/ChangeLog:

	* elfxx-riscv.c (riscv_parse_check_conflicts): Accept RV32EF
	because only older specifications disallowed it.

gas/ChangeLog:

	* testsuite/gas/riscv/march-fail-rv32ef.d: Remove as not directly
	prohibited.
	* testsuite/gas/riscv/march-fail-rv32ef.l: Likewise.
---

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 94bff0e0388..300ccf49534 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -1876,13 +1876,6 @@ riscv_parse_check_conflicts (riscv_parse_subset_t *rps)
       rps->error_handler (_("rv%d does not support the `q' extension"), xlen);
       no_conflict = false;
     }
-  if (riscv_lookup_subset (rps->subset_list, "e", &subset)
-      && riscv_lookup_subset (rps->subset_list, "f", &subset))
-    {
-      rps->error_handler
-        (_("rv32e does not support the `f' extension"));
-      no_conflict = false;
-    }
   if (riscv_lookup_subset (rps->subset_list, "zfinx", &subset)
       && riscv_lookup_subset (rps->subset_list, "f", &subset))
     {
diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ef.d b/gas/testsuite/gas/riscv/march-fail-rv32ef.d
deleted file mode 100644
index d7b51c3c17d..00000000000
--- a/gas/testsuite/gas/riscv/march-fail-rv32ef.d
+++ /dev/null
@@ -1,3 +0,0 @@
-#as: -march=rv32ef
-#source: empty.s
-#error_output: march-fail-rv32ef.l
diff --git a/gas/testsuite/gas/riscv/march-fail-rv32ef.l b/gas/testsuite/gas/riscv/march-fail-rv32ef.l
deleted file mode 100644
index e6d93f28fa5..00000000000
--- a/gas/testsuite/gas/riscv/march-fail-rv32ef.l
+++ /dev/null
@@ -1,2 +0,0 @@
-.*Assembler messages:
-.*Error: .*rv32e does not support the `f' extension