From b800637e7631482d1bece2463b7c89e2d873d9d0 Mon Sep 17 00:00:00 2001 From: Nelson Chu Date: Wed, 13 Jan 2021 16:52:14 +0800 Subject: 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. --- ld/ChangeLog | 9 +++++++++ ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index f856715..5a0f07f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2021-01-15 Nelson Chu + + * 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. + 2021-01-14 Nick Clifton * po/fr.po: Updated French translation. diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d index f3e2f2a..3509cae 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d @@ -2,8 +2,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d index 9e98809..88defe1 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d @@ -2,8 +2,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d index 05dffda..7a1b977 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d index ff10f3f..37b8afc 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d index 7c1cc56..30446c9 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d index 1a81538f..8c7624c 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0 -#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions +#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0 +#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions #readelf: -A Attribute Section: riscv -- cgit v1.1