diff options
| author | Nelson Chu <nelson.chu@sifive.com> | 2020-08-19 11:49:24 +0800 |
|---|---|---|
| committer | Nelson Chu <nelson.chu@sifive.com> | 2020-09-03 11:12:02 +0800 |
| commit | 9184ef8a92371746d0f36580adf2ad6845f1ced3 (patch) | |
| tree | 90ba667de441c9cb945525db043b0e802b4b174c /ld | |
| parent | 32f0ce4db98eb1e8e1cc326d3a22ef0c436ae6fe (diff) | |
| download | gdb-9184ef8a92371746d0f36580adf2ad6845f1ced3.zip gdb-9184ef8a92371746d0f36580adf2ad6845f1ced3.tar.gz gdb-9184ef8a92371746d0f36580adf2ad6845f1ced3.tar.bz2 | |
RISC-V: Minor cleanup and typos when merging elf attributes.
bfd/
* elfnn-riscv.c (riscv_i_or_e_p): Minor cleanup for warnings/errors.
(riscv_merge_std_ext): Likewise.
(riscv_merge_arch_attr_info): Likewise.
(riscv_merge_attributes): Likewise and fix comment typos.
ld/
* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Remove
the useless `warnings` keywords.
* 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.
Diffstat (limited to 'ld')
7 files changed, 22 insertions, 12 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 185f37b..261390a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,15 @@ 2020-09-03 Nelson Chu <nelson.chu@sifive.com> + * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Remove + the useless `warnings` keywords. + * 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. + +2020-09-03 Nelson Chu <nelson.chu@sifive.com> + * testsuite/ld-riscv-elf/attr-merge-arch-failed-01.d: Update the message from error to warning. * testsuite/ld-riscv-elf/attr-merge-arch-failed-02.d: New testcases. 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 0d5d6dc..f3e2f2a 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: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #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 f0f75b2..9e98809 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: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #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 af51552..05dffda 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: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #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 2328807..ff10f3f 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: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #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 cabaab6..7c1cc56 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: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #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 e774748..1a81538f 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: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#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 #readelf: -A Attribute Section: riscv |