From: Nelson Chu <nelson.chu@sifive.com>
To: binutils@sourceware.org
Cc: jimw@sifive.com, kito.cheng@sifive.com, nelson.chu@sifive.com
Subject: [PATCH 3/3] RISC-V: Minor cleanup and typos when merging priv spec attributes.
Date: Wed, 19 Aug 2020 23:34:42 -0700 [thread overview]
Message-ID: <1597905282-22927-4-git-send-email-nelson.chu@sifive.com> (raw)
In-Reply-To: <1597905282-22927-1-git-send-email-nelson.chu@sifive.com>
bfd/
* elfnn-riscv.c (riscv_merge_attributes): 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.
---
bfd/elfnn-riscv.c | 4 ++--
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, 14 insertions(+), 14 deletions(-)
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 513785e..5fc08fe 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -3046,7 +3046,7 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
out_attr[Tag_b].i,
out_attr[Tag_c].i);
- /* The priv spec v1.9.1 can be linked with other spec
+ /* The priv spec v1.9.1 can not be linked with other spec
versions since the conflicts. We plan to drop the
v1.9.1 in a year or two, so this confict should be
removed in the future. */
@@ -3058,7 +3058,7 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
"linked with other spec versions."));
}
- /* Update the output priv attributes to the newest. */
+ /* Update the output priv spec to the newest one. */
if (in_priv_spec > out_priv_spec)
{
out_attr[Tag_a].i = in_attr[Tag_a].i;
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..007eaa3 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..6707cee 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..7679fbf 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..ee37ce1 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..c5fafad 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..7251be0 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
--
2.7.4
next prev parent reply other threads:[~2020-08-20 6:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 6:34 [PATCH 0/3] Allow to link objects with different versions of ISA, and fix some minor issues Nelson Chu
2020-08-20 6:34 ` [PATCH 1/3] RISC-V: Improve the error message for the mis-matched ISA versions Nelson Chu
2020-08-20 6:34 ` [PATCH 2/3] RISC-V: Report warnings rather than errors " Nelson Chu
2020-08-20 6:34 ` Nelson Chu [this message]
2020-08-25 17:13 ` [PATCH 0/3] Allow to link objects with different versions of ISA, and fix some minor issues Palmer Dabbelt
2020-08-25 17:40 ` Fangrui Song
2020-08-26 1:29 ` Nelson Chu
2020-09-03 3:29 ` Nelson Chu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1597905282-22927-4-git-send-email-nelson.chu@sifive.com \
--to=nelson.chu@sifive.com \
--cc=binutils@sourceware.org \
--cc=jimw@sifive.com \
--cc=kito.cheng@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).