RISC-V: Minor cleanup for s extension support.

Looking at older versions of the patch, I confirmed that the odd comment
I referred to earlier was indeed from the removal of the sx support.  It
also explains an oddly formatted switch statement.  This patch fixes both
minor problems.

	bfd/
	* elfxx-riscv.c (riscv_get_prefix_class): Format s case like others.
	(riscv_parse_prefixed_ext): Fix s extension comment and reword to
	avoid over long line.

Change-Id: I1cb62e4a16188270f029b6376e4b1684000d6c7a

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5d8d2cdb9eb161b98f14d02d4fcbe767ab730f49..558e11eda344d86dcfa12c46bc9e893b4c30033c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-24  Jim Wilson  <jimw@sifive.com>
+
+       * elfxx-riscv.c (riscv_get_prefix_class): Format s case like others.
+       (riscv_parse_prefixed_ext): Fix s extension comment and reword to
+       avoid over long line.
+
 2020-01-24  Nick Clifton  <nickc@redhat.com>
 
        PR 25447

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index fdcf9028ab5c1d219d627cfe7bf9d5c2506e436e..0a0711ef8d4e5b1baa0892f328a8e599aad4b149 100644 (file)
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -1244,9 +1244,7 @@ riscv_get_prefix_class (const char *arch)
 {
   switch (*arch)
     {
-    case 's':
-      return RV_ISA_CLASS_S;
-
+    case 's': return RV_ISA_CLASS_S;
     case 'x': return RV_ISA_CLASS_X;
     case 'z': return RV_ISA_CLASS_Z;
     default: return RV_ISA_CLASS_UNKNOWN;
@@ -1324,8 +1322,8 @@ riscv_parse_prefixed_ext (riscv_parse_subset_t *rps,
 
       /* Check that the name is valid.
         For 'x', anything goes but it cannot simply be 'x'.
-        For 'z', it must be known from a list and also cannot simply be 'z'.
-        For 's', it must be known from a list and also *can* simply be 's'.  */
+        For 's', it must be known from a list and cannot simply be 's'.
+        For 'z', it must be known from a list and cannot simply be 'z'.  */
 
       /* Check that the extension name is well-formed.  */
       if (!config->ext_valid_p (subset))