diff options
| -rw-r--r-- | bfd/elfnn-riscv.c | 17 | ||||
| -rwxr-xr-x | gdb/contrib/spellcheck.sh | 14 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d | 13 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d | 13 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d | 13 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d | 13 | ||||
| -rw-r--r-- | ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp | 6 |
9 files changed, 10 insertions, 103 deletions
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index c8bf45f..3aba9c8 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -4071,20 +4071,9 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) else if (in_priv_spec != PRIV_SPEC_CLASS_NONE && in_priv_spec != out_priv_spec) { - _bfd_error_handler - (_("warning: %pB use privileged spec version %u.%u.%u but " - "the output use version %u.%u.%u"), - ibfd, - in_attr[Tag_a].i, - in_attr[Tag_b].i, - in_attr[Tag_c].i, - out_attr[Tag_a].i, - out_attr[Tag_b].i, - out_attr[Tag_c].i); - - /* The privileged spec v1.9.1 can not be linked with others - since the conflicts, so we plan to drop it in a year or - two. */ + /* The abandoned privileged spec v1.9.1 can not be linked with + others since the conflicts. Keep the check since compatible + issue. */ if (in_priv_spec == PRIV_SPEC_CLASS_1P9P1 || out_priv_spec == PRIV_SPEC_CLASS_1P9P1) { diff --git a/gdb/contrib/spellcheck.sh b/gdb/contrib/spellcheck.sh index d15e124..420891f 100755 --- a/gdb/contrib/spellcheck.sh +++ b/gdb/contrib/spellcheck.sh @@ -269,13 +269,13 @@ parse_dictionary () local i word replacement i=0 for word in "${words[@]}"; do - replacement=${replacements[$i]} + replacement=${replacements[i]} # Skip words that are already handled. This ensures that the local # dictionary overrides the wiki dictionary. if [ "${words_done[$word]}" == 1 ]; then - words[$i]="" - replacements[$i]="" + words[i]="" + replacements[i]="" i=$((i + 1)) continue fi @@ -283,8 +283,8 @@ parse_dictionary () # Skip identity rules. if [ "$word" = "$replacement" ]; then - words[$i]="" - replacements[$i]="" + words[i]="" + replacements[i]="" fi i=$((i + 1)) @@ -296,7 +296,7 @@ print_dictionary () local i word replacement i=0 for word in "${words[@]}"; do - replacement=${replacements[$i]} + replacement=${replacements[i]} i=$((i + 1)) if [ "$word" == "" ]; then @@ -519,7 +519,7 @@ main () local i word replacement i=0 for word in "${words[@]}"; do - replacement=${replacements[$i]} + replacement=${replacements[i]} i=$((i + 1)) if [ "$word" = "" ]; then 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 deleted file mode 100644 index 7f98707..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d +++ /dev/null @@ -1,12 +0,0 @@ -#source: attr-merge-priv-spec-a.s -#source: attr-merge-priv-spec-c.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 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 deleted file mode 100644 index f86ef10..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d +++ /dev/null @@ -1,12 +0,0 @@ -#source: attr-merge-priv-spec-c.s -#source: attr-merge-priv-spec-a.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 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 deleted file mode 100644 index cfbb233..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d +++ /dev/null @@ -1,13 +0,0 @@ -#source: attr-merge-priv-spec-a.s -#source: attr-merge-priv-spec-d.s -#source: attr-merge-priv-spec-c.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 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 deleted file mode 100644 index 4332597..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d +++ /dev/null @@ -1,13 +0,0 @@ -#source: attr-merge-priv-spec-d.s -#source: attr-merge-priv-spec-a.s -#source: attr-merge-priv-spec-c.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 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 deleted file mode 100644 index bb6573d..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d +++ /dev/null @@ -1,13 +0,0 @@ -#source: attr-merge-priv-spec-c.s -#source: attr-merge-priv-spec-d.s -#source: attr-merge-priv-spec-a.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 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 deleted file mode 100644 index 9d97ff9..0000000 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d +++ /dev/null @@ -1,13 +0,0 @@ -#source: attr-merge-priv-spec-d.s -#source: attr-merge-priv-spec-c.s -#source: attr-merge-priv-spec-a.s -#as: -#ld: -r -#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0 -#readelf: -A - -Attribute Section: riscv -File Attributes - Tag_RISCV_arch: [a-zA-Z0-9_\"].* - Tag_RISCV_priv_spec: 1 - Tag_RISCV_priv_spec_minor: 11 diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp index 0ee2025..7b1b2aa 100644 --- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp +++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp @@ -165,12 +165,6 @@ if [istarget "riscv*-*-*"] { run_dump_test "attr-merge-priv-spec-03" run_dump_test "attr-merge-user-ext-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_dump_test "attr-phdr" run_dump_test "relax-max-align-gp" run_dump_test "uleb128" |