diff options
| author | emaste <emaste@FreeBSD.org> | 2016-05-20 17:24:34 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-05-20 17:24:34 +0000 |
| commit | e1afa8a66332bcb42ea042ec5dfb59de5b33ee08 (patch) | |
| tree | 53f16cf467b740bb55f778ee1a5c3b117e43c2e0 /contrib/elftoolchain/nm | |
| parent | 1860a225caf7329b3bc2038750624b9d0b47139a (diff) | |
| parent | db27a04d331bc804aa12a4a70e9e0d939f3773c0 (diff) | |
| download | FreeBSD-src-e1afa8a66332bcb42ea042ec5dfb59de5b33ee08.zip FreeBSD-src-e1afa8a66332bcb42ea042ec5dfb59de5b33ee08.tar.gz | |
Update to ELF Tool Chain r3475
Improvements include:
* Add support for reporting and handling a number of new constants in
various tools, including:
* CloudABI OSABI
* DT_TLSDESC_*
* i386, MIPS, SPARC and amd64 relocations
* C++ demangler bug fixes
* Man page updates
* Improved input validation in several tools
This update also reduces diffs against upstream as a number of fixes
included in upstream were previously cherry-picked into FreeBSD.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'contrib/elftoolchain/nm')
| -rw-r--r-- | contrib/elftoolchain/nm/nm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/elftoolchain/nm/nm.c b/contrib/elftoolchain/nm/nm.c index 87a456e..ebb42ca 100644 --- a/contrib/elftoolchain/nm/nm.c +++ b/contrib/elftoolchain/nm/nm.c @@ -48,7 +48,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: nm.c 3179 2015-03-31 19:38:56Z emaste $"); +ELFTC_VCSID("$Id: nm.c 3472 2016-05-17 20:11:16Z emaste $"); /* symbol information list */ STAILQ_HEAD(sym_head, sym_entry); @@ -790,7 +790,8 @@ is_sec_debug(const char *shname) }; const char **p; - assert(shname != NULL && "shname is NULL"); + if (shname == NULL) + return (false); for (p = dbg_sec; *p; p++) { if (!strncmp(shname, *p, strlen(*p))) @@ -1716,7 +1717,7 @@ sym_elem_print_all_sysv(char type, const char *sec, const GElf_Sym *sym, case STT_NOTYPE: default: printf("%18s|", "NOTYPE"); - }; + } if (sym->st_size != 0) nm_opts.size_print_fn(sym); @@ -1945,7 +1946,7 @@ sym_list_print_each(struct sym_entry *ep, struct sym_print_data *p, return; sec = p->s_table[ep->sym->st_shndx]; break; - }; + } nm_opts.elem_print_fn(type, sec, ep->sym, ep->name); |
