From 5e9b84f7a2e13af9ed00e262ad844e192b88ea8c Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Wed, 29 Jul 2020 13:50:10 +0100 Subject: binutils, ld: dequote libctf error messages These are not identifiers and should not be quoted. (Also, quoting them just looks odd.) Adjust diagnostics tests accordingly. binutils/ChangeLog 2020-08-27 Nick Alcock * objdump.c (dump_ctf_errs): Unquote CTF error messages. * readelf.c (dump_ctf_errs): Likewise. ld/ChangeLog 2020-08-27 Nick Alcock * 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. --- ld/ldlang.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ld/ldlang.c') diff --git a/ld/ldlang.c b/ld/ldlang.c index dc6f1b4..4249b3a 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; -- cgit v1.1