diff options
author | Nick Alcock <nick.alcock@oracle.com> | 2020-06-04 15:07:54 +0100 |
---|---|---|
committer | Nick Alcock <nick.alcock@oracle.com> | 2020-07-22 18:02:17 +0100 |
commit | 8b37e7b63ed77fa66e08c7dd08147db6a263d0fb (patch) | |
tree | c280e06227a691786531e22149349fbc003499a5 /binutils/readelf.c | |
parent | b7190c821e529d7858cff7c2fcc57304a1d38d2b (diff) | |
download | gdb-8b37e7b63ed77fa66e08c7dd08147db6a263d0fb.zip gdb-8b37e7b63ed77fa66e08c7dd08147db6a263d0fb.tar.gz gdb-8b37e7b63ed77fa66e08c7dd08147db6a263d0fb.tar.bz2 |
libctf, ld, binutils: add textual error/warning reporting for libctf
This commit adds a long-missing piece of infrastructure to libctf: the
ability to report errors and warnings using all the power of printf,
rather than being restricted to one errno value. Internally, libctf
calls ctf_err_warn() to add errors and warnings to a list: a new
iterator ctf_errwarning_next() then consumes this list one by one and
hands it to the caller, which can free it. New errors and warnings are
added until the list is consumed by the caller or the ctf_file_t is
closed, so you can dump them at intervals. The caller can of course
choose to print only those warnings it wants. (I am not sure whether we
want objdump, readelf or ld to print warnings or not: right now I'm
printing them, but maybe we only want to print errors? This entirely
depends on whether warnings are voluminous things describing e.g. the
inability to emit single types because of name clashes or something.
There are no users of this infrastructure yet, so it's hard to say.)
There is no internationalization here yet, but this at least adds a
place where internationalization can be added, to one of
ctf_errwarning_next or ctf_err_warn.
We also provide a new ctf_assert() function which uses this
infrastructure to provide non-fatal assertion failures while emitting an
assert-like string to the caller: to save space and avoid needlessly
duplicating unchanging strings, the assertion test is inlined but the
print-things-out failure case is not. All assertions in libctf will be
converted to use this machinery in future commits and propagate
assertion-failure errors up, so that the linker in particular cannot be
killed by libctf assertion failures when it could perfectly well just
print warnings and drop the CTF section.
include/
* ctf-api.h (ECTF_INTERNAL): Adjust error text.
(ctf_errwarning_next): New.
libctf/
* ctf-impl.h (ctf_assert): New.
(ctf_err_warning_t): Likewise.
(ctf_file_t) <ctf_errs_warnings>: Likewise.
(ctf_err_warn): New prototype.
(ctf_assert_fail_internal): Likewise.
* ctf-inlines.h (ctf_assert_internal): Likewise.
* ctf-open.c (ctf_file_close): Free ctf_errs_warnings.
* ctf-create.c (ctf_serialize): Copy it on serialization.
* ctf-subr.c (ctf_err_warn): New, add an error/warning.
(ctf_errwarning_next): New iterator, free and pass back
errors/warnings in succession.
* libctf.ver (ctf_errwarning_next): Add.
ld/
* ldlang.c (lang_ctf_errs_warnings): New, print CTF errors
and warnings. Assert when libctf asserts.
(lang_merge_ctf): Call it.
(land_write_ctf): Likewise.
binutils/
* objdump.c (ctf_archive_member): Print CTF errors and warnings.
* readelf.c (dump_ctf_archive_member): Likewise.
Diffstat (limited to 'binutils/readelf.c')
-rw-r--r-- | binutils/readelf.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/binutils/readelf.c b/binutils/readelf.c index c3cbd2c..421992d 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -14215,7 +14215,11 @@ dump_ctf_archive_member (ctf_file_t *ctf, const char *name, void *arg) "Function objects", "Variables", "Types", "Strings", ""}; const char **thing; + ctf_next_t *it = NULL; + char *errtext; + int is_warning; size_t i; + int err = 0; /* Only print out the name of non-default-named archive members. The name .ctf appears everywhere, even for things that aren't @@ -14248,10 +14252,25 @@ dump_ctf_archive_member (ctf_file_t *ctf, const char *name, void *arg) { error (_("Iteration failed: %s, %s\n"), *thing, ctf_errmsg (ctf_errno (ctf))); - return 1; + err = 1; + goto out; } } - return 0; + + out: + /* Dump accumulated errors and warnings. */ + while ((errtext = ctf_errwarning_next (ctf, &it, &is_warning)) != NULL) + { + error (_("%s: `%s'\n"), is_warning ? _("warning"): _("error"), + errtext); + free (errtext); + } + if (ctf_errno (ctf) != ECTF_NEXT_END) + { + error (_("CTF error: cannot get CTF errors: `%s'\n"), + ctf_errmsg (ctf_errno (ctf))); + } + return err; } static bfd_boolean |