[PATCH 3/3] binutils, ld: dequote libctf error messages
Nick Alcock
nick.alcock@oracle.com
Fri Jul 31 19:16:17 GMT 2020
These are not identifiers and should not be quoted. (Also, quoting them
just looks odd.)
Adjust diagnostics tests accordingly.
binutils/ChangeLog
2020-07-27 Nick Alcock <nick.alcock@oracle.com>
* objdump.c (dump_ctf_errs): Unquote CTF error messages.
* readelf.c (dump_ctf_errs): Likewise.
ld/ChangeLog
2020-07-27 Nick Alcock <nick.alcock@oracle.com>
* ldlang.c (dump_ctf_errs): Unquote CTF error messages.
(ldlang_open_ctf): Likewise.
(lang_merge_ctf): Likewise.
(lang_write_ctf): Likewise.
* testsuite/ld-ctf/diag-ctf-version-f.d: Adjust.
* testsuite/ld-ctf/diag-cttname-invalid.d: Adjust.
* testsuite/ld-ctf/diag-decompression-failure.d: Adjust.
* testsuite/ld-ctf/diag-parname.d: Adjust.
* testsuite/ld-ctf/diag-unsupported-flag.d: Adjust.
* testsuite/ld-ctf/diag-wrong-magic-number-mixed.d: Adjust.
* testsuite/ld-ctf/diag-wrong-magic-number.d: Adjust.
---
binutils/objdump.c | 2 +-
binutils/readelf.c | 2 +-
ld/ldlang.c | 8 ++++----
ld/testsuite/ld-ctf/diag-ctf-version-f.d | 2 +-
ld/testsuite/ld-ctf/diag-cttname-invalid.d | 2 +-
ld/testsuite/ld-ctf/diag-decompression-failure.d | 2 +-
ld/testsuite/ld-ctf/diag-parname.d | 2 +-
ld/testsuite/ld-ctf/diag-unsupported-flag.d | 2 +-
ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d | 2 +-
ld/testsuite/ld-ctf/diag-wrong-magic-number.d | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/binutils/objdump.c b/binutils/objdump.c
index c1848961416..c7ad51e41eb 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -4083,7 +4083,7 @@ dump_ctf_errs (ctf_file_t *fp)
/* Dump accumulated errors and warnings. */
while ((errtext = ctf_errwarning_next (fp, &it, &is_warning, &err)) != NULL)
{
- non_fatal (_("%s: `%s'"), is_warning ? _("warning"): _("error"),
+ non_fatal (_("%s: %s"), is_warning ? _("warning"): _("error"),
errtext);
free (errtext);
}
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 1466f7519aa..5e38b43312b 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -14217,7 +14217,7 @@ dump_ctf_errs (ctf_file_t *fp)
/* Dump accumulated errors and warnings. */
while ((errtext = ctf_errwarning_next (fp, &it, &is_warning, &err)) != NULL)
{
- error (_("%s: `%s'"), is_warning ? _("warning"): _("error"),
+ error (_("%s: %s"), is_warning ? _("warning"): _("error"),
errtext);
free (errtext);
}
diff --git a/ld/ldlang.c b/ld/ldlang.c
index dc6f1b40399..4249b3a045d 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -3683,7 +3683,7 @@ lang_ctf_errs_warnings (ctf_file_t *fp)
while ((text = ctf_errwarning_next (fp, &i, &is_warning, &err)) != NULL)
{
- einfo (_("%s: `%s'\n"), is_warning ? _("CTF warning"): _("CTF error"),
+ einfo (_("%s: %s\n"), is_warning ? _("CTF warning"): _("CTF error"),
text);
free (text);
}
@@ -3724,7 +3724,7 @@ ldlang_open_ctf (void)
{
lang_ctf_errs_warnings (NULL);
einfo (_("%P: warning: CTF section in %pB not loaded; "
- "its types will be discarded: `%s'\n"), file->the_bfd,
+ "its types will be discarded: %s\n"), file->the_bfd,
ctf_errmsg (err));
}
continue;
@@ -3814,7 +3814,7 @@ lang_merge_ctf (void)
{
lang_ctf_errs_warnings (ctf_output);
einfo (_("%P: warning: CTF linking failed; "
- "output will have no CTF section: `%s'\n"),
+ "output will have no CTF section: %s\n"),
ctf_errmsg (ctf_errno (ctf_output)));
if (output_sect)
{
@@ -3874,7 +3874,7 @@ lang_write_ctf (int late)
if (!output_sect->contents)
{
einfo (_("%P: warning: CTF section emission failed; "
- "output will have no CTF section: `%s'\n"),
+ "output will have no CTF section: %s\n"),
ctf_errmsg (ctf_errno (ctf_output)));
output_sect->size = 0;
output_sect->flags |= SEC_EXCLUDE;
diff --git a/ld/testsuite/ld-ctf/diag-ctf-version-f.d b/ld/testsuite/ld-ctf/diag-ctf-version-f.d
index 860aae92a32..811ed5b017b 100644
--- a/ld/testsuite/ld-ctf/diag-ctf-version-f.d
+++ b/ld/testsuite/ld-ctf/diag-ctf-version-f.d
@@ -2,4 +2,4 @@
#source: diag-ctf-version-f.s
#ld: -shared
#name: Diagnostics - Unsupported CTF version
-#warning: CTF section .* not loaded; its types will be discarded: .CTF dict version is too new for libctf.
+#warning: CTF section .* not loaded; its types will be discarded: CTF dict version is too new for libctf
diff --git a/ld/testsuite/ld-ctf/diag-cttname-invalid.d b/ld/testsuite/ld-ctf/diag-cttname-invalid.d
index de4aedc8842..8755c7e6664 100644
--- a/ld/testsuite/ld-ctf/diag-cttname-invalid.d
+++ b/ld/testsuite/ld-ctf/diag-cttname-invalid.d
@@ -2,4 +2,4 @@
#source: diag-cttname-invalid.s
#ld: -shared
#name: Diagnostics - Invalid type name.
-#warning: CTF section in .*not loaded; its types will be discarded: .String name offset is corrupt.
+#warning: CTF section in .*not loaded; its types will be discarded: String name offset is corrupt
diff --git a/ld/testsuite/ld-ctf/diag-decompression-failure.d b/ld/testsuite/ld-ctf/diag-decompression-failure.d
index c4567e10919..1deeea18044 100644
--- a/ld/testsuite/ld-ctf/diag-decompression-failure.d
+++ b/ld/testsuite/ld-ctf/diag-decompression-failure.d
@@ -2,4 +2,4 @@
#source: diag-decompression-failure.s
#ld: -shared
#name: Diagnostics - Decompression failure
-#warning: CTF section.* not loaded; its types will be discarded: .Failed to decompress CTF data.
+#warning: CTF section.* not loaded; its types will be discarded: Failed to decompress CTF data
diff --git a/ld/testsuite/ld-ctf/diag-parname.d b/ld/testsuite/ld-ctf/diag-parname.d
index d2ce9aac81f..f8fcd683a9d 100644
--- a/ld/testsuite/ld-ctf/diag-parname.d
+++ b/ld/testsuite/ld-ctf/diag-parname.d
@@ -2,4 +2,4 @@
#source: diag-parname.s
#ld: -shared --ctf-variables
#name: Diagnostics - No parent dictionary
-#warning: CTF linking failed; output will have no CTF section: .The parent CTF dictionary is unavailable.
+#warning: CTF linking failed; output will have no CTF section: The parent CTF dictionary is unavailable
diff --git a/ld/testsuite/ld-ctf/diag-unsupported-flag.d b/ld/testsuite/ld-ctf/diag-unsupported-flag.d
index 879781772aa..6b7a359e78c 100644
--- a/ld/testsuite/ld-ctf/diag-unsupported-flag.d
+++ b/ld/testsuite/ld-ctf/diag-unsupported-flag.d
@@ -2,4 +2,4 @@
#source: diag-unsupported-flag.s
#ld: -shared
#name: Diagnostics - Unsupported flag
-#warning: CTF section.* not loaded; its types will be discarded: .CTF header contains flags unknown to libctf.
+#warning: CTF section.* not loaded; its types will be discarded: CTF header contains flags unknown to libctf
diff --git a/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d b/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d
index 5415c131940..1e3344750c9 100644
--- a/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d
+++ b/ld/testsuite/ld-ctf/diag-wrong-magic-number-mixed.d
@@ -3,7 +3,7 @@
#source: B.c
#ld: -shared --ctf-variables
#name: Diagnostics - Wrong magic number mixed with valid CTF sections
-#warning: CTF section in .* not loaded; its types will be discarded: .Buffer does not contain CTF data.
+#warning: CTF section in .* not loaded; its types will be discarded: Buffer does not contain CTF data
.*: +file format .*
diff --git a/ld/testsuite/ld-ctf/diag-wrong-magic-number.d b/ld/testsuite/ld-ctf/diag-wrong-magic-number.d
index 847bbf87240..0c27b0c996e 100644
--- a/ld/testsuite/ld-ctf/diag-wrong-magic-number.d
+++ b/ld/testsuite/ld-ctf/diag-wrong-magic-number.d
@@ -2,4 +2,4 @@
#source: diag-wrong-magic-number.s
#ld: -shared
#name: Diagnostics - Wrong magic number
-#warning: CTF section in .* not loaded; its types will be discarded: .Buffer does not contain CTF data.
+#warning: CTF section in .* not loaded; its types will be discarded: Buffer does not contain CTF data
--
2.28.0.248.gcf383e60c9
More information about the Binutils
mailing list