diff options
author | Jose E. Marchesi <jose.marchesi@oracle.com> | 2019-05-31 11:10:51 +0200 |
---|---|---|
committer | Jose E. Marchesi <jose.marchesi@oracle.com> | 2019-05-31 11:10:51 +0200 |
commit | a0486bac41d6ce47f27795a5abbca5cc53ddba00 (patch) | |
tree | f68e14cbd729cfb89a15307d4ccdd110658286dc /libctf/ctf-dump.c | |
parent | ff4a4474eba6488c8ad3cae51a685fe282ab249a (diff) | |
download | fsf-binutils-gdb-a0486bac41d6ce47f27795a5abbca5cc53ddba00.zip fsf-binutils-gdb-a0486bac41d6ce47f27795a5abbca5cc53ddba00.tar.gz fsf-binutils-gdb-a0486bac41d6ce47f27795a5abbca5cc53ddba00.tar.bz2 |
libctf: fix a number of build problems found on Solaris and NetBSD
- Use of nonportable <endian.h>
- Use of qsort_r
- Use of zlib without appropriate magic to pull in the binutils zlib
- Use of off64_t without checking (fixed by dropping the unused fields
that need off64_t entirely)
- signedness problems due to long being too short a type on 32-bit
platforms: ctf_id_t is now 'unsigned long', and CTF_ERR must be
used only for functions that return ctf_id_t
- One lingering use of bzero() and of <sys/errno.h>
All fixed, using code from gnulib where possible.
Relatedly, set cts_size in a couple of places it was missed
(string table and symbol table loading upon ctf_bfdopen()).
binutils/
* objdump.c (make_ctfsect): Drop cts_type, cts_flags, and
cts_offset.
* readelf.c (shdr_to_ctf_sect): Likewise.
include/
* ctf-api.h (ctf_sect_t): Drop cts_type, cts_flags, and cts_offset.
(ctf_id_t): This is now an unsigned type.
(CTF_ERR): Cast it to ctf_id_t. Note that it should only be used
for ctf_id_t-returning functions.
libctf/
* Makefile.am (ZLIB): New.
(ZLIBINC): Likewise.
(AM_CFLAGS): Use them.
(libctf_a_LIBADD): New, for LIBOBJS.
* configure.ac: Check for zlib, endian.h, and qsort_r.
* ctf-endian.h: New, providing htole64 and le64toh.
* swap.h: Code style fixes.
(bswap_identity_64): New.
* qsort_r.c: New, from gnulib (with one added #include).
* ctf-decls.h: New, providing a conditional qsort_r declaration,
and unconditional definitions of MIN and MAX.
* ctf-impl.h: Use it. Do not use <sys/errno.h>.
(ctf_set_errno): Now returns unsigned long.
* ctf-util.c (ctf_set_errno): Adjust here too.
* ctf-archive.c: Use ctf-endian.h.
(ctf_arc_open_by_offset): Use memset, not bzero. Drop cts_type,
cts_flags and cts_offset.
(ctf_arc_write): Drop debugging dependent on the size of off_t.
* ctf-create.c: Provide a definition of roundup if not defined.
(ctf_create): Drop cts_type, cts_flags and cts_offset.
(ctf_add_reftype): Do not check if type IDs are below zero.
(ctf_add_slice): Likewise.
(ctf_add_typedef): Likewise.
(ctf_add_member_offset): Cast error-returning ssize_t's to size_t
when known error-free. Drop CTF_ERR usage for functions returning
int.
(ctf_add_member_encoded): Drop CTF_ERR usage for functions returning
int.
(ctf_add_variable): Likewise.
(enumcmp): Likewise.
(enumadd): Likewise.
(membcmp): Likewise.
(ctf_add_type): Likewise. Cast error-returning ssize_t's to size_t
when known error-free.
* ctf-dump.c (ctf_is_slice): Drop CTF_ERR usage for functions
returning int: use CTF_ERR for functions returning ctf_type_id.
(ctf_dump_label): Likewise.
(ctf_dump_objts): Likewise.
* ctf-labels.c (ctf_label_topmost): Likewise.
(ctf_label_iter): Likewise.
(ctf_label_info): Likewise.
* ctf-lookup.c (ctf_func_args): Likewise.
* ctf-open.c (upgrade_types): Cast to size_t where appropriate.
(ctf_bufopen): Likewise. Use zlib types as needed.
* ctf-types.c (ctf_member_iter): Drop CTF_ERR usage for functions
returning int.
(ctf_enum_iter): Likewise.
(ctf_type_size): Likewise.
(ctf_type_align): Likewise. Cast to size_t where appropriate.
(ctf_type_kind_unsliced): Likewise.
(ctf_type_kind): Likewise.
(ctf_type_encoding): Likewise.
(ctf_member_info): Likewise.
(ctf_array_info): Likewise.
(ctf_enum_value): Likewise.
(ctf_type_rvisit): Likewise.
* ctf-open-bfd.c (ctf_bfdopen): Drop cts_type, cts_flags and
cts_offset.
(ctf_simple_open): Likewise.
(ctf_bfdopen_ctfsect): Likewise. Set cts_size properly.
* Makefile.in: Regenerate.
* aclocal.m4: Likewise.
* config.h: Likewise.
* configure: Likewise.
Diffstat (limited to 'libctf/ctf-dump.c')
-rw-r--r-- | libctf/ctf-dump.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libctf/ctf-dump.c b/libctf/ctf-dump.c index 28f31e4..c2ed791 100644 --- a/libctf/ctf-dump.c +++ b/libctf/ctf-dump.c @@ -88,7 +88,7 @@ ctf_is_slice (ctf_file_t *fp, ctf_id_t id, ctf_encoding_t *enc) return (((kind == CTF_K_INTEGER) || (kind == CTF_K_ENUM) || (kind == CTF_K_FLOAT)) && ctf_type_reference (fp, id) != CTF_ERR - && ctf_type_encoding (fp, id, enc) != CTF_ERR); + && ctf_type_encoding (fp, id, enc) == 0); } /* Return a dump for a single type, without member info: but do show the @@ -168,7 +168,7 @@ ctf_dump_label (const char *name, const ctf_lblinfo_t *info, if ((typestr = ctf_dump_format_type (state->cds_fp, info->ctb_type)) == NULL) { free (str); - return CTF_ERR; /* errno is set for us. */ + return -1; /* errno is set for us. */ } str = ctf_str_append (str, typestr); @@ -194,14 +194,14 @@ ctf_dump_objts (ctf_file_t *fp, ctf_dump_state_t *state) const char *sym_name; ctf_id_t type; - if ((type = ctf_lookup_by_symbol (state->cds_fp, i)) < 0) + if ((type = ctf_lookup_by_symbol (state->cds_fp, i)) == CTF_ERR) switch (ctf_errno (state->cds_fp)) { /* Most errors are just an indication that this symbol is not a data symbol, but this one indicates that we were called wrong, on a CTF file with no associated symbol table. */ case ECTF_NOSYMTAB: - return CTF_ERR; + return -1; case ECTF_NOTDATA: case ECTF_NOTYPEDAT: continue; @@ -224,7 +224,7 @@ ctf_dump_objts (ctf_file_t *fp, ctf_dump_state_t *state) if ((typestr = ctf_dump_format_type (state->cds_fp, type)) == NULL) { free (str); - return CTF_ERR; /* errno is set for us. */ + return -1; /* errno is set for us. */ } str = ctf_str_append (str, typestr); @@ -253,14 +253,14 @@ ctf_dump_funcs (ctf_file_t *fp, ctf_dump_state_t *state) size_t j; ctf_id_t *args; - if ((type = ctf_func_info (state->cds_fp, i, &fi)) < 0) + if ((type = ctf_func_info (state->cds_fp, i, &fi)) == CTF_ERR) switch (ctf_errno (state->cds_fp)) { /* Most errors are just an indication that this symbol is not a data symbol, but this one indicates that we were called wrong, on a CTF file with no associated symbol table. */ case ECTF_NOSYMTAB: - return CTF_ERR; + return -1; case ECTF_NOTDATA: case ECTF_NOTYPEDAT: continue; @@ -321,7 +321,7 @@ ctf_dump_funcs (ctf_file_t *fp, ctf_dump_state_t *state) err: free (args); free (str); - return CTF_ERR; /* errno is set for us. */ + return -1; /* errno is set for us. */ } return 0; } @@ -340,7 +340,7 @@ ctf_dump_var (const char *name, ctf_id_t type, void *arg) if ((typestr = ctf_dump_format_type (state->cds_fp, type)) == NULL) { free (str); - return CTF_ERR; /* errno is set for us. */ + return -1; /* errno is set for us. */ } str = ctf_str_append (str, typestr); @@ -426,7 +426,7 @@ ctf_dump_type (ctf_id_t id, void *arg) err: free (str); - return CTF_ERR; /* errno is set for us. */ + return -1; /* errno is set for us. */ } /* Dump the string table into the cds_items. */ |