From 412857647fecd41c45fab0d9c45198a0d2cbf6d5 Mon Sep 17 00:00:00 2001 From: Nelson Chu Date: Fri, 29 May 2020 16:56:36 +0800 Subject: [PATCH] RISC-V: The object without priv spec attributes can be linked with any object. bfd/ * elfnn-riscv.c (riscv_merge_attributes): Add new boolean priv_may_conflict, in_priv_zero and out_priv_zero to decide whether the object can be linked according to it's priv attributes. The object without any priv spec attributes can be linked with others. If the first input object doesn't contain any priv attributes, then we need to copy the setting from the next input one. Also report more detailed error messages to user. ld/ * testsuite/ld-riscv-elf/attr-merge-priv-spec.d: Rename to attr-merge-priv-spec-01.d. * testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s: Set priv spec to 1.11. * testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s: Empty priv spec setting. * testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d: New testcase. * testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d: Likewise. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Likewise. * 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. * testsuite/ld-riscv-elf/ld-riscv-elf.exp: Updated. --- bfd/ChangeLog | 10 +++++ bfd/elfnn-riscv.c | 40 ++++++++++++++++++- ld/ChangeLog | 15 +++++++ ...-priv-spec.d => attr-merge-priv-spec-01.d} | 0 .../ld-riscv-elf/attr-merge-priv-spec-02.d | 12 ++++++ .../ld-riscv-elf/attr-merge-priv-spec-03.d | 12 ++++++ .../ld-riscv-elf/attr-merge-priv-spec-c.s | 2 + .../ld-riscv-elf/attr-merge-priv-spec-d.s | 1 + .../attr-merge-priv-spec-failed-01.d | 5 +++ .../attr-merge-priv-spec-failed-02.d | 5 +++ .../attr-merge-priv-spec-failed-03.d | 6 +++ .../attr-merge-priv-spec-failed-04.d | 6 +++ .../attr-merge-priv-spec-failed-05.d | 6 +++ .../attr-merge-priv-spec-failed-06.d | 6 +++ ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp | 10 ++++- 15 files changed, 133 insertions(+), 3 deletions(-) rename ld/testsuite/ld-riscv-elf/{attr-merge-priv-spec.d => attr-merge-priv-spec-01.d} (100%) create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d create mode 100644 ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e99de6dbed8..0a34054da8c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2020-06-05 Nelson Chu + + * elfnn-riscv.c (riscv_merge_attributes): Add new boolean + priv_may_conflict, in_priv_zero and out_priv_zero to decide + whether the object can be linked according to it's priv + attributes. The object without any priv spec attributes can + be linked with others. If the first input object doesn't contain + any priv attributes, then we need to copy the setting from the + next input one. Also report more detailed error messages to user. + 2020-06-04 Stephen Casner Extend pdp11-aout symbol table format to accommodate .stab diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 163c4d9f745..986e717782f 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -2987,6 +2987,9 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) obj_attribute *in_attr; obj_attribute *out_attr; bfd_boolean result = TRUE; + bfd_boolean priv_may_conflict = FALSE; + bfd_boolean in_priv_zero = TRUE; + bfd_boolean out_priv_zero = TRUE; const char *sec_name = get_elf_backend_data (ibfd)->obj_attrs_section; unsigned int i; @@ -3041,20 +3044,52 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) out_attr[Tag_RISCV_arch].s = merged_arch; } break; + case Tag_RISCV_priv_spec: case Tag_RISCV_priv_spec_minor: case Tag_RISCV_priv_spec_revision: + if (in_attr[i].i != 0) + in_priv_zero = FALSE; + if (out_attr[i].i != 0) + out_priv_zero = FALSE; if (out_attr[i].i != in_attr[i].i) + priv_may_conflict = TRUE; + + /* We check the priv version conflict when parsing the + revision version. */ + if (i != Tag_RISCV_priv_spec_revision) + break; + + /* Allow to link the object without the priv setting. */ + if (out_priv_zero) + { + out_attr[i].i = in_attr[i].i; + out_attr[Tag_RISCV_priv_spec].i = + in_attr[Tag_RISCV_priv_spec].i; + out_attr[Tag_RISCV_priv_spec_minor].i = + in_attr[Tag_RISCV_priv_spec_minor].i; + } + else if (!in_priv_zero + && priv_may_conflict) { _bfd_error_handler - (_("error: %pB: conflicting priv spec version " - "(major/minor/revision)."), ibfd); + (_("error: %pB use privilege spec version %u.%u.%u but " + "the output use version %u.%u.%u."), + ibfd, + in_attr[Tag_RISCV_priv_spec].i, + in_attr[Tag_RISCV_priv_spec_minor].i, + in_attr[i].i, + out_attr[Tag_RISCV_priv_spec].i, + out_attr[Tag_RISCV_priv_spec_minor].i, + out_attr[i].i); result = FALSE; } break; + case Tag_RISCV_unaligned_access: out_attr[i].i |= in_attr[i].i; break; + case Tag_RISCV_stack_align: if (out_attr[i].i == 0) out_attr[i].i = in_attr[i].i; @@ -3069,6 +3104,7 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) result = FALSE; } break; + default: result &= _bfd_elf_merge_unknown_attribute_low (ibfd, obfd, i); } diff --git a/ld/ChangeLog b/ld/ChangeLog index 5b6805a31bc..b40d36b3e74 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,18 @@ +2020-06-05 Nelson Chu + + * testsuite/ld-riscv-elf/attr-merge-priv-spec.d: Rename to + attr-merge-priv-spec-01.d. + * testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s: Set spec to 1.11. + * testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s: Empty priv spec set. + * testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d: New testcase. + * testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d: Likewise. + * 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. + * testsuite/ld-riscv-elf/ld-riscv-elf.exp: Updated. + 2020-06-05 Nelson Chu * testsuite/ld-riscv-elf/attr-merge-arch-01.d: The CSR isn't used, diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d similarity index 100% rename from ld/testsuite/ld-riscv-elf/attr-merge-priv-spec.d rename to ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d new file mode 100644 index 00000000000..0ac4ca7c045 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d @@ -0,0 +1,12 @@ +#source: attr-merge-priv-spec-a.s +#source: attr-merge-priv-spec-d.s +#as: -march-attr +#ld: -r +#readelf: -A + +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: [a-zA-Z0-9_\"].* + Tag_RISCV_priv_spec: 1 + Tag_RISCV_priv_spec_minor: 9 + Tag_RISCV_priv_spec_revision: 1 diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d new file mode 100644 index 00000000000..69504839d72 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d @@ -0,0 +1,12 @@ +#source: attr-merge-priv-spec-d.s +#source: attr-merge-priv-spec-a.s +#as: -march-attr +#ld: -r +#readelf: -A + +Attribute Section: riscv +File Attributes + Tag_RISCV_arch: [a-zA-Z0-9_\"].* + Tag_RISCV_priv_spec: 1 + Tag_RISCV_priv_spec_minor: 9 + Tag_RISCV_priv_spec_revision: 1 diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s new file mode 100644 index 00000000000..7ea3185cd19 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-c.s @@ -0,0 +1,2 @@ + .attribute priv_spec, 1 + .attribute priv_spec_minor, 11 diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s new file mode 100644 index 00000000000..37fddd0d2d9 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-d.s @@ -0,0 +1 @@ +# Empty priv attributes setting. 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 new file mode 100644 index 00000000000..c52ebac3019 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d @@ -0,0 +1,5 @@ +#source: attr-merge-priv-spec-a.s +#source: attr-merge-priv-spec-c.s +#as: +#ld: -r +#error: .*use privilege spec version 1.11.0 but the output use version 1.9.1. 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 new file mode 100644 index 00000000000..fc001459c69 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d @@ -0,0 +1,5 @@ +#source: attr-merge-priv-spec-c.s +#source: attr-merge-priv-spec-a.s +#as: +#ld: -r +#error: .*use privilege spec version 1.9.1 but the output use version 1.11.0. 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 new file mode 100644 index 00000000000..1d40e905e38 --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d @@ -0,0 +1,6 @@ +#source: attr-merge-priv-spec-a.s +#source: attr-merge-priv-spec-d.s +#source: attr-merge-priv-spec-c.s +#as: +#ld: -r +#error: .*use privilege spec version 1.11.0 but the output use version 1.9.1. 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 new file mode 100644 index 00000000000..0efee3ce24a --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d @@ -0,0 +1,6 @@ +#source: attr-merge-priv-spec-d.s +#source: attr-merge-priv-spec-a.s +#source: attr-merge-priv-spec-c.s +#as: +#ld: -r +#error: .*use privilege spec version 1.11.0 but the output use version 1.9.1. 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 new file mode 100644 index 00000000000..5b9b8d08edc --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d @@ -0,0 +1,6 @@ +#source: attr-merge-priv-spec-c.s +#source: attr-merge-priv-spec-d.s +#source: attr-merge-priv-spec-a.s +#as: +#ld: -r +#error: .*use privilege spec version 1.9.1 but the output use version 1.11.0. 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 new file mode 100644 index 00000000000..dab7eb6b34d --- /dev/null +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d @@ -0,0 +1,6 @@ +#source: attr-merge-priv-spec-d.s +#source: attr-merge-priv-spec-c.s +#source: attr-merge-priv-spec-a.s +#as: +#ld: -r +#error: .*use privilege spec version 1.9.1 but the output use version 1.11.0. diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp index 0e9750e4960..1a0c68fc44f 100644 --- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp +++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp @@ -35,9 +35,17 @@ if [istarget "riscv*-*-*"] { run_dump_test "attr-merge-strict-align-04" run_dump_test "attr-merge-strict-align-05" run_dump_test "attr-merge-stack-align" - run_dump_test "attr-merge-priv-spec" + run_dump_test "attr-merge-priv-spec-01" + run_dump_test "attr-merge-priv-spec-02" + run_dump_test "attr-merge-priv-spec-03" run_dump_test "attr-merge-arch-failed-01" run_dump_test "attr-merge-stack-align-failed" + run_dump_test "attr-merge-priv-spec-failed-01" + run_dump_test "attr-merge-priv-spec-failed-02" + run_dump_test "attr-merge-priv-spec-failed-03" + run_dump_test "attr-merge-priv-spec-failed-04" + run_dump_test "attr-merge-priv-spec-failed-05" + run_dump_test "attr-merge-priv-spec-failed-06" run_ld_link_tests { { "Weak reference 32" "-T weakref.ld -melf32lriscv" "" "-march=rv32i -mabi=ilp32" {weakref32.s} -- 2.30.2