RISC-V: Error and warning messages tidy.

Error and warning messages usually starting with lower case letter,
and without the period at the end.  Besides, add the prefixed "internel:"
at the beginning of the messages when they are caused internally.
Also fix indents and typos.

bfd/
    * elfnn-riscv.c (riscv_merge_attributes): Fix typos of messages.
gas/
    * config/tc-riscv.c: Error and warning messages tidy.
    * testsuite/gas/riscv/priv-reg-fail-fext.l: Updated.
    * testsuite/gas/riscv/priv-reg-fail-read-only-01.l: Likewise.
    * testsuite/gas/riscv/priv-reg-fail-read-only-02.l: Likewise.
    * testsuite/gas/riscv/priv-reg-fail-rv32-only.l: Likewise.
    * testsuite/gas/riscv/priv-reg-fail-version-1p10.l: Likewise.
    * testsuite/gas/riscv/priv-reg-fail-version-1p11.l: Likewise.
    * testsuite/gas/riscv/priv-reg-fail-version-1p9p1.l: Likewise.
ld/
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Updated.
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d: Likewise.
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d: Likewise.
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d: Likewise.
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d: Likewise.
    * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d: Likewise.
opcodes/
    * riscv-dis.c (parse_riscv_dis_option): Fix typos of message.

7 files changed, 234 insertions, 234 deletions

diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-fext.l b/gas/testsuite/gas/riscv/priv-reg-fail-fext.l
index 2ee0dae..c44f44d 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-fext.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-fext.l
@@ -1,6 +1,6 @@
 .*Assembler messages:
 #...
-.*Warning: Invalid CSR `fflags' for the current ISA
-.*Warning: Invalid CSR `frm' for the current ISA
-.*Warning: Invalid CSR `fcsr' for the current ISA
+.*Warning: invalid CSR `fflags' for the current ISA
+.*Warning: invalid CSR `frm' for the current ISA
+.*Warning: invalid CSR `fcsr' for the current ISA
 #...
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-read-only-01.l b/gas/testsuite/gas/riscv/priv-reg-fail-read-only-01.l
index 305cd17..a0ca62f 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-read-only-01.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-read-only-01.l
@@ -1,71 +1,71 @@
 .*Assembler messages:
 #...
-.*Warning: Read-only CSR is written `csrw cycle,a1'
-.*Warning: Read-only CSR is written `csrw time,a1'
-.*Warning: Read-only CSR is written `csrw instret,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter3,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter4,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter5,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter6,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter7,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter8,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter9,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter10,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter11,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter12,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter13,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter14,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter15,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter16,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter17,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter18,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter19,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter20,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter21,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter22,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter23,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter24,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter25,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter26,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter27,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter28,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter29,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter30,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter31,a1'
-.*Warning: Read-only CSR is written `csrw cycleh,a1'
-.*Warning: Read-only CSR is written `csrw timeh,a1'
-.*Warning: Read-only CSR is written `csrw instreth,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter3h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter4h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter5h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter6h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter7h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter8h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter9h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter10h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter11h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter12h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter13h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter14h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter15h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter16h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter17h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter18h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter19h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter20h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter21h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter22h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter23h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter24h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter25h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter26h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter27h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter28h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter29h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter30h,a1'
-.*Warning: Read-only CSR is written `csrw hpmcounter31h,a1'
-.*Warning: Read-only CSR is written `csrw mvendorid,a1'
-.*Warning: Read-only CSR is written `csrw marchid,a1'
-.*Warning: Read-only CSR is written `csrw mimpid,a1'
-.*Warning: Read-only CSR is written `csrw mhartid,a1'
+.*Warning: read-only CSR is written `csrw cycle,a1'
+.*Warning: read-only CSR is written `csrw time,a1'
+.*Warning: read-only CSR is written `csrw instret,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter3,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter4,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter5,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter6,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter7,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter8,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter9,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter10,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter11,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter12,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter13,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter14,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter15,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter16,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter17,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter18,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter19,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter20,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter21,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter22,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter23,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter24,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter25,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter26,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter27,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter28,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter29,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter30,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter31,a1'
+.*Warning: read-only CSR is written `csrw cycleh,a1'
+.*Warning: read-only CSR is written `csrw timeh,a1'
+.*Warning: read-only CSR is written `csrw instreth,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter3h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter4h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter5h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter6h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter7h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter8h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter9h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter10h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter11h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter12h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter13h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter14h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter15h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter16h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter17h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter18h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter19h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter20h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter21h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter22h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter23h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter24h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter25h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter26h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter27h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter28h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter29h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter30h,a1'
+.*Warning: read-only CSR is written `csrw hpmcounter31h,a1'
+.*Warning: read-only CSR is written `csrw mvendorid,a1'
+.*Warning: read-only CSR is written `csrw marchid,a1'
+.*Warning: read-only CSR is written `csrw mimpid,a1'
+.*Warning: read-only CSR is written `csrw mhartid,a1'
 #...
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-read-only-02.l b/gas/testsuite/gas/riscv/priv-reg-fail-read-only-02.l
index 660f19d..96f83a9 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-read-only-02.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-read-only-02.l
@@ -1,25 +1,25 @@
 .*Assembler messages:
-.*Warning: Read-only CSR is written `csrrw a0,cycle,a1'
-.*Warning: Read-only CSR is written `csrrw a0,cycle,zero'
-.*Warning: Read-only CSR is written `csrrw zero,cycle,a1'
-.*Warning: Read-only CSR is written `csrrw zero,cycle,zero'
-.*Warning: Read-only CSR is written `csrw cycle,a1'
-.*Warning: Read-only CSR is written `csrw cycle,zero'
-.*Warning: Read-only CSR is written `csrrwi a0,cycle,0xb'
-.*Warning: Read-only CSR is written `csrrwi a0,cycle,0x0'
-.*Warning: Read-only CSR is written `csrrwi zero,cycle,0xb'
-.*Warning: Read-only CSR is written `csrrwi zero,cycle,0x0'
-.*Warning: Read-only CSR is written `csrwi cycle,0xb'
-.*Warning: Read-only CSR is written `csrwi cycle,0x0'
-.*Warning: Read-only CSR is written `csrrs a0,cycle,a1'
-.*Warning: Read-only CSR is written `csrrs zero,cycle,a1'
-.*Warning: Read-only CSR is written `csrs cycle,a0'
-.*Warning: Read-only CSR is written `csrrsi a0,cycle,0xb'
-.*Warning: Read-only CSR is written `csrrsi zero,cycle,0xb'
-.*Warning: Read-only CSR is written `csrsi cycle,0xb'
-.*Warning: Read-only CSR is written `csrrc a0,cycle,a1'
-.*Warning: Read-only CSR is written `csrrc zero,cycle,a1'
-.*Warning: Read-only CSR is written `csrc cycle,a0'
-.*Warning: Read-only CSR is written `csrrci a0,cycle,0xb'
-.*Warning: Read-only CSR is written `csrrci zero,cycle,0xb'
-.*Warning: Read-only CSR is written `csrci cycle,0xb'
+.*Warning: read-only CSR is written `csrrw a0,cycle,a1'
+.*Warning: read-only CSR is written `csrrw a0,cycle,zero'
+.*Warning: read-only CSR is written `csrrw zero,cycle,a1'
+.*Warning: read-only CSR is written `csrrw zero,cycle,zero'
+.*Warning: read-only CSR is written `csrw cycle,a1'
+.*Warning: read-only CSR is written `csrw cycle,zero'
+.*Warning: read-only CSR is written `csrrwi a0,cycle,0xb'
+.*Warning: read-only CSR is written `csrrwi a0,cycle,0x0'
+.*Warning: read-only CSR is written `csrrwi zero,cycle,0xb'
+.*Warning: read-only CSR is written `csrrwi zero,cycle,0x0'
+.*Warning: read-only CSR is written `csrwi cycle,0xb'
+.*Warning: read-only CSR is written `csrwi cycle,0x0'
+.*Warning: read-only CSR is written `csrrs a0,cycle,a1'
+.*Warning: read-only CSR is written `csrrs zero,cycle,a1'
+.*Warning: read-only CSR is written `csrs cycle,a0'
+.*Warning: read-only CSR is written `csrrsi a0,cycle,0xb'
+.*Warning: read-only CSR is written `csrrsi zero,cycle,0xb'
+.*Warning: read-only CSR is written `csrsi cycle,0xb'
+.*Warning: read-only CSR is written `csrrc a0,cycle,a1'
+.*Warning: read-only CSR is written `csrrc zero,cycle,a1'
+.*Warning: read-only CSR is written `csrc cycle,a0'
+.*Warning: read-only CSR is written `csrrci a0,cycle,0xb'
+.*Warning: read-only CSR is written `csrrci zero,cycle,0xb'
+.*Warning: read-only CSR is written `csrci cycle,0xb'
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-rv32-only.l b/gas/testsuite/gas/riscv/priv-reg-fail-rv32-only.l
index 5dec50f..70fd776 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-rv32-only.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-rv32-only.l
@@ -1,68 +1,68 @@
 .*Assembler messages:
 #...
-.*Warning: Invalid CSR `cycleh' for the current ISA
-.*Warning: Invalid CSR `timeh' for the current ISA
-.*Warning: Invalid CSR `instreth' for the current ISA
-.*Warning: Invalid CSR `hpmcounter3h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter4h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter5h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter6h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter7h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter8h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter9h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter10h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter11h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter12h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter13h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter14h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter15h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter16h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter17h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter18h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter19h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter20h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter21h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter22h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter23h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter24h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter25h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter26h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter27h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter28h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter29h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter30h' for the current ISA
-.*Warning: Invalid CSR `hpmcounter31h' for the current ISA
-.*Warning: Invalid CSR `pmpcfg1' for the current ISA
-.*Warning: Invalid CSR `pmpcfg3' for the current ISA
-.*Warning: Invalid CSR `mcycleh' for the current ISA
-.*Warning: Invalid CSR `minstreth' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter3h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter4h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter5h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter6h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter7h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter8h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter9h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter10h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter11h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter12h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter13h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter14h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter15h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter16h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter17h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter18h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter19h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter20h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter21h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter22h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter23h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter24h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter25h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter26h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter27h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter28h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter29h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter30h' for the current ISA
-.*Warning: Invalid CSR `mhpmcounter31h' for the current ISA
+.*Warning: invalid CSR `cycleh' for the current ISA
+.*Warning: invalid CSR `timeh' for the current ISA
+.*Warning: invalid CSR `instreth' for the current ISA
+.*Warning: invalid CSR `hpmcounter3h' for the current ISA
+.*Warning: invalid CSR `hpmcounter4h' for the current ISA
+.*Warning: invalid CSR `hpmcounter5h' for the current ISA
+.*Warning: invalid CSR `hpmcounter6h' for the current ISA
+.*Warning: invalid CSR `hpmcounter7h' for the current ISA
+.*Warning: invalid CSR `hpmcounter8h' for the current ISA
+.*Warning: invalid CSR `hpmcounter9h' for the current ISA
+.*Warning: invalid CSR `hpmcounter10h' for the current ISA
+.*Warning: invalid CSR `hpmcounter11h' for the current ISA
+.*Warning: invalid CSR `hpmcounter12h' for the current ISA
+.*Warning: invalid CSR `hpmcounter13h' for the current ISA
+.*Warning: invalid CSR `hpmcounter14h' for the current ISA
+.*Warning: invalid CSR `hpmcounter15h' for the current ISA
+.*Warning: invalid CSR `hpmcounter16h' for the current ISA
+.*Warning: invalid CSR `hpmcounter17h' for the current ISA
+.*Warning: invalid CSR `hpmcounter18h' for the current ISA
+.*Warning: invalid CSR `hpmcounter19h' for the current ISA
+.*Warning: invalid CSR `hpmcounter20h' for the current ISA
+.*Warning: invalid CSR `hpmcounter21h' for the current ISA
+.*Warning: invalid CSR `hpmcounter22h' for the current ISA
+.*Warning: invalid CSR `hpmcounter23h' for the current ISA
+.*Warning: invalid CSR `hpmcounter24h' for the current ISA
+.*Warning: invalid CSR `hpmcounter25h' for the current ISA
+.*Warning: invalid CSR `hpmcounter26h' for the current ISA
+.*Warning: invalid CSR `hpmcounter27h' for the current ISA
+.*Warning: invalid CSR `hpmcounter28h' for the current ISA
+.*Warning: invalid CSR `hpmcounter29h' for the current ISA
+.*Warning: invalid CSR `hpmcounter30h' for the current ISA
+.*Warning: invalid CSR `hpmcounter31h' for the current ISA
+.*Warning: invalid CSR `pmpcfg1' for the current ISA
+.*Warning: invalid CSR `pmpcfg3' for the current ISA
+.*Warning: invalid CSR `mcycleh' for the current ISA
+.*Warning: invalid CSR `minstreth' for the current ISA
+.*Warning: invalid CSR `mhpmcounter3h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter4h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter5h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter6h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter7h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter8h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter9h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter10h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter11h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter12h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter13h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter14h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter15h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter16h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter17h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter18h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter19h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter20h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter21h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter22h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter23h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter24h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter25h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter26h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter27h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter28h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter29h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter30h' for the current ISA
+.*Warning: invalid CSR `mhpmcounter31h' for the current ISA
 #...
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p10.l b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p10.l
index 983f593..fbba6e5 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p10.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p10.l
@@ -1,25 +1,25 @@
 .*Assembler messages:
-.*Warning: Invalid CSR `mcountinhibit' for the privilege spec `1.10'
-.*Warning: Invalid CSR `ubadaddr' for the privilege spec `1.10'
-.*Warning: Invalid CSR `sbadaddr' for the privilege spec `1.10'
-.*Warning: Invalid CSR `sptbr' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mbadaddr' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mucounteren' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hstatus' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hedeleg' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hideleg' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hie' for the privilege spec `1.10'
-.*Warning: Invalid CSR `htvec' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hscratch' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hepc' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hcause' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hbadaddr' for the privilege spec `1.10'
-.*Warning: Invalid CSR `hip' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mbase' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mbound' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mibase' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mibound' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mdbase' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mdbound' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mscounteren' for the privilege spec `1.10'
-.*Warning: Invalid CSR `mhcounteren' for the privilege spec `1.10'
+.*Warning: invalid CSR `mcountinhibit' for the privileged spec `1.10'
+.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.10'
+.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.10'
+.*Warning: invalid CSR `sptbr' for the privileged spec `1.10'
+.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.10'
+.*Warning: invalid CSR `mucounteren' for the privileged spec `1.10'
+.*Warning: invalid CSR `hstatus' for the privileged spec `1.10'
+.*Warning: invalid CSR `hedeleg' for the privileged spec `1.10'
+.*Warning: invalid CSR `hideleg' for the privileged spec `1.10'
+.*Warning: invalid CSR `hie' for the privileged spec `1.10'
+.*Warning: invalid CSR `htvec' for the privileged spec `1.10'
+.*Warning: invalid CSR `hscratch' for the privileged spec `1.10'
+.*Warning: invalid CSR `hepc' for the privileged spec `1.10'
+.*Warning: invalid CSR `hcause' for the privileged spec `1.10'
+.*Warning: invalid CSR `hbadaddr' for the privileged spec `1.10'
+.*Warning: invalid CSR `hip' for the privileged spec `1.10'
+.*Warning: invalid CSR `mbase' for the privileged spec `1.10'
+.*Warning: invalid CSR `mbound' for the privileged spec `1.10'
+.*Warning: invalid CSR `mibase' for the privileged spec `1.10'
+.*Warning: invalid CSR `mibound' for the privileged spec `1.10'
+.*Warning: invalid CSR `mdbase' for the privileged spec `1.10'
+.*Warning: invalid CSR `mdbound' for the privileged spec `1.10'
+.*Warning: invalid CSR `mscounteren' for the privileged spec `1.10'
+.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.10'
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p11.l b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p11.l
index 0e036e4..68354ce 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p11.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p11.l
@@ -1,24 +1,24 @@
 .*Assembler messages:
-.*Warning: Invalid CSR `ubadaddr' for the privilege spec `1.11'
-.*Warning: Invalid CSR `sbadaddr' for the privilege spec `1.11'
-.*Warning: Invalid CSR `sptbr' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mbadaddr' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mucounteren' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hstatus' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hedeleg' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hideleg' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hie' for the privilege spec `1.11'
-.*Warning: Invalid CSR `htvec' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hscratch' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hepc' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hcause' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hbadaddr' for the privilege spec `1.11'
-.*Warning: Invalid CSR `hip' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mbase' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mbound' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mibase' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mibound' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mdbase' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mdbound' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mscounteren' for the privilege spec `1.11'
-.*Warning: Invalid CSR `mhcounteren' for the privilege spec `1.11'
+.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.11'
+.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.11'
+.*Warning: invalid CSR `sptbr' for the privileged spec `1.11'
+.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.11'
+.*Warning: invalid CSR `mucounteren' for the privileged spec `1.11'
+.*Warning: invalid CSR `hstatus' for the privileged spec `1.11'
+.*Warning: invalid CSR `hedeleg' for the privileged spec `1.11'
+.*Warning: invalid CSR `hideleg' for the privileged spec `1.11'
+.*Warning: invalid CSR `hie' for the privileged spec `1.11'
+.*Warning: invalid CSR `htvec' for the privileged spec `1.11'
+.*Warning: invalid CSR `hscratch' for the privileged spec `1.11'
+.*Warning: invalid CSR `hepc' for the privileged spec `1.11'
+.*Warning: invalid CSR `hcause' for the privileged spec `1.11'
+.*Warning: invalid CSR `hbadaddr' for the privileged spec `1.11'
+.*Warning: invalid CSR `hip' for the privileged spec `1.11'
+.*Warning: invalid CSR `mbase' for the privileged spec `1.11'
+.*Warning: invalid CSR `mbound' for the privileged spec `1.11'
+.*Warning: invalid CSR `mibase' for the privileged spec `1.11'
+.*Warning: invalid CSR `mibound' for the privileged spec `1.11'
+.*Warning: invalid CSR `mdbase' for the privileged spec `1.11'
+.*Warning: invalid CSR `mdbound' for the privileged spec `1.11'
+.*Warning: invalid CSR `mscounteren' for the privileged spec `1.11'
+.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.11'
diff --git a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p9p1.l b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p9p1.l
index 8a8126a..817f664 100644
--- a/gas/testsuite/gas/riscv/priv-reg-fail-version-1p9p1.l
+++ b/gas/testsuite/gas/riscv/priv-reg-fail-version-1p9p1.l
@@ -1,28 +1,28 @@
 .*Assembler messages:
-.*Warning: Invalid CSR `utval' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `scounteren' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `stval' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `satp' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `mcounteren' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `mtval' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpcfg0' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpcfg1' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpcfg2' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpcfg3' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr0' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr1' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr2' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr3' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr4' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr5' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr6' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr7' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr8' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr9' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr10' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr11' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr12' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr13' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr14' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `pmpaddr15' for the privilege spec `1.9.1'
-.*Warning: Invalid CSR `mcountinhibit' for the privilege spec `1.9.1'
+.*Warning: invalid CSR `utval' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `scounteren' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `stval' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `satp' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `mcounteren' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `mtval' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpcfg0' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpcfg1' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpcfg2' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpcfg3' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr0' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr1' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr2' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr3' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr4' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr5' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr6' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr7' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr8' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr9' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr10' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr11' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr12' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr13' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr14' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `pmpaddr15' for the privileged spec `1.9.1'
+.*Warning: invalid CSR `mcountinhibit' for the privileged spec `1.9.1'