X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldcref.c;h=9120bf87fbd9add1f19eda4729a62c729656a46c;hb=02eba61aa6cad683e96cf13f483adc04982c0c2b;hp=19c9062f4c36307cbc6a7f237dcbf951abad1c48;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldcref.c b/ld/ldcref.c index 19c9062f4c..9120bf87fb 100644 --- a/ld/ldcref.c +++ b/ld/ldcref.c @@ -1,5 +1,5 @@ /* ldcref.c -- output a cross reference table - Copyright (C) 1996-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2020 Free Software Foundation, Inc. Written by Ian Lance Taylor This file is part of the GNU Binutils. @@ -27,6 +27,7 @@ #include "sysdep.h" #include "bfd.h" #include "bfdlink.h" +#include "ctf-api.h" #include "libiberty.h" #include "demangle.h" #include "objalloc.h" @@ -112,8 +113,8 @@ static size_t cref_symcount; static struct bfd_hash_entry **old_table; static unsigned int old_size; static unsigned int old_count; -static void * old_tab; -static void * alloc_mark; +static void *old_tab; +static void *alloc_mark; static size_t tabsize, entsize, refsize; static size_t old_symcount; @@ -163,7 +164,7 @@ add_cref (const char *name, struct cref_hash_entry *h; struct cref_ref *r; - if (! cref_initialized) + if (!cref_initialized) { if (!bfd_hash_table_init (&cref_table.root, cref_hash_newfunc, sizeof (struct cref_hash_entry))) @@ -346,10 +347,10 @@ cref_fill_array (struct cref_hash_entry *h, void *data) static int cref_sort_array (const void *a1, const void *a2) { - const struct cref_hash_entry * const *p1 = - (const struct cref_hash_entry * const *) a1; - const struct cref_hash_entry * const *p2 = - (const struct cref_hash_entry * const *) a2; + const struct cref_hash_entry *const *p1 + = (const struct cref_hash_entry *const *) a1; + const struct cref_hash_entry *const *p2 + = (const struct cref_hash_entry *const *) a2; if (demangling) return strcmp ((*p1)->demangled, (*p2)->demangled); @@ -379,7 +380,7 @@ output_cref (FILE *fp) } fprintf (fp, _("File\n")); - if (! cref_initialized) + if (!cref_initialized) { fprintf (fp, _("No symbols\n")); return; @@ -410,7 +411,7 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h) hl = bfd_link_hash_lookup (link_info.hash, h->root.string, FALSE, FALSE, TRUE); if (hl == NULL) - einfo ("%P: symbol `%T' missing from main hash table\n", + einfo (_("%P: symbol `%pT' missing from main hash table\n"), h->root.string); else { @@ -452,7 +453,7 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h) putc (' ', fp); ++len; } - lfinfo (fp, "%B\n", r->abfd); + lfinfo (fp, "%pB\n", r->abfd); len = 0; } } @@ -466,21 +467,21 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h) putc (' ', fp); ++len; } - lfinfo (fp, "%B\n", r->abfd); + lfinfo (fp, "%pB\n", r->abfd); len = 0; } } for (r = h->refs; r != NULL; r = r->next) { - if (! r->def && ! r->common) + if (!r->def && !r->common) { while (len < FILECOL) { putc (' ', fp); ++len; } - lfinfo (fp, "%B\n", r->abfd); + lfinfo (fp, "%pB\n", r->abfd); len = 0; } } @@ -493,7 +494,7 @@ output_one_cref (FILE *fp, struct cref_hash_entry *h) void check_nocrossrefs (void) { - if (! cref_initialized) + if (!cref_initialized) return; cref_hash_traverse (&cref_table, check_nocrossref, NULL); @@ -514,7 +515,7 @@ check_local_sym_xref (lang_input_statement_type *statement) return; if (!bfd_generic_link_read_symbols (abfd)) - einfo (_("%B%F: could not read symbols: %E\n"), abfd); + einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd); for (syms = bfd_get_outsymbols (abfd); *syms; ++syms) { @@ -534,8 +535,14 @@ check_local_sym_xref (lang_input_statement_type *statement) symname = sym->name; for (ncrs = nocrossref_list; ncrs != NULL; ncrs = ncrs->next) for (ncr = ncrs->list; ncr != NULL; ncr = ncr->next) - if (strcmp (ncr->name, outsecname) == 0) - check_refs (symname, FALSE, sym->section, abfd, ncrs); + { + if (strcmp (ncr->name, outsecname) == 0) + check_refs (symname, FALSE, sym->section, abfd, ncrs); + /* The NOCROSSREFS_TO command only checks symbols defined in + the first section in the list. */ + if (ncrs->onlyfirst) + break; + } } } } @@ -556,7 +563,7 @@ check_nocrossref (struct cref_hash_entry *h, void *ignore ATTRIBUTE_UNUSED) FALSE, TRUE); if (hl == NULL) { - einfo (_("%P: symbol `%T' missing from main hash table\n"), + einfo (_("%P: symbol `%pT' missing from main hash table\n"), h->root.string); return TRUE; } @@ -568,14 +575,20 @@ check_nocrossref (struct cref_hash_entry *h, void *ignore ATTRIBUTE_UNUSED) defsec = hl->u.def.section->output_section; if (defsec == NULL) return TRUE; - defsecname = bfd_get_section_name (defsec->owner, defsec); + defsecname = bfd_section_name (defsec); for (ncrs = nocrossref_list; ncrs != NULL; ncrs = ncrs->next) for (ncr = ncrs->list; ncr != NULL; ncr = ncr->next) - if (strcmp (ncr->name, defsecname) == 0) - for (ref = h->refs; ref != NULL; ref = ref->next) - check_refs (hl->root.string, TRUE, hl->u.def.section, - ref->abfd, ncrs); + { + if (strcmp (ncr->name, defsecname) == 0) + for (ref = h->refs; ref != NULL; ref = ref->next) + check_refs (hl->root.string, TRUE, hl->u.def.section, + ref->abfd, ncrs); + /* The NOCROSSREFS_TO command only checks symbols defined in the first + section in the list. */ + if (ncrs->onlyfirst) + break; + } return TRUE; } @@ -583,7 +596,8 @@ check_nocrossref (struct cref_hash_entry *h, void *ignore ATTRIBUTE_UNUSED) /* The struct is used to pass information from check_refs to check_reloc_refs through bfd_map_over_sections. */ -struct check_refs_info { +struct check_refs_info +{ const char *sym_name; asection *defsec; struct lang_nocrossrefs *ncrs; @@ -612,7 +626,7 @@ check_refs (const char *name, BFD might contain a prohibited cross reference. */ if (!bfd_generic_link_read_symbols (abfd)) - einfo (_("%B%F: could not read symbols: %E\n"), abfd); + einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd); info.sym_name = name; info.global = global; @@ -645,10 +659,10 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg) arelent **p, **pend; outsec = sec->output_section; - outsecname = bfd_get_section_name (outsec->owner, outsec); + outsecname = bfd_section_name (outsec); outdefsec = info->defsec->output_section; - outdefsecname = bfd_get_section_name (outdefsec->owner, outdefsec); + outdefsecname = bfd_section_name (outdefsec); /* The section where the symbol is defined is permitted. */ if (strcmp (outsecname, outdefsecname) == 0) @@ -674,14 +688,14 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg) relsize = bfd_get_reloc_upper_bound (abfd, sec); if (relsize < 0) - einfo (_("%B%F: could not read relocs: %E\n"), abfd); + einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd); if (relsize == 0) return; relpp = (arelent **) xmalloc (relsize); relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols); if (relcount < 0) - einfo (_("%B%F: could not read relocs: %E\n"), abfd); + einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd); p = relpp; pend = p + relcount; @@ -692,14 +706,14 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg) if (q->sym_ptr_ptr != NULL && *q->sym_ptr_ptr != NULL && ((global - && (bfd_is_und_section (bfd_get_section (*q->sym_ptr_ptr)) - || bfd_is_com_section (bfd_get_section (*q->sym_ptr_ptr)) + && (bfd_is_und_section (bfd_asymbol_section (*q->sym_ptr_ptr)) + || bfd_is_com_section (bfd_asymbol_section (*q->sym_ptr_ptr)) || ((*q->sym_ptr_ptr)->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)) || (!global && ((*q->sym_ptr_ptr)->flags & (BSF_LOCAL | BSF_SECTION_SYM)) != 0 - && bfd_get_section (*q->sym_ptr_ptr) == info->defsec)) + && bfd_asymbol_section (*q->sym_ptr_ptr) == info->defsec)) && (symname != NULL ? strcmp (bfd_asymbol_name (*q->sym_ptr_ptr), symname) == 0 : ((*q->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0)) @@ -708,7 +722,7 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg) in OUTSECNAME. This reloc is from a section which is mapped into a section from which references to OUTSECNAME are prohibited. We must report an error. */ - einfo (_("%X%C: prohibited cross reference from %s to `%T' in %s\n"), + einfo (_("%X%P: %C: prohibited cross reference from %s to `%pT' in %s\n"), abfd, sec, q->address, outsecname, bfd_asymbol_name (*q->sym_ptr_ptr), outdefsecname); }