X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf32-metag.c;h=7938b24d2a5fd3517b916913a5924693f2731aed;hb=7ab967941150b2f79fc089893bf51e6bb53d245b;hp=44923edc7b4fc1335eeb4cff35389306b38a6a77;hpb=53215f214c61b850085196a8d69774eed026ecd9;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index 44923edc7b..7938b24d2a 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -785,10 +785,6 @@ struct elf_metag_link_hash_entry symbol. */ struct elf_metag_stub_hash_entry *hsh_cache; - /* Used to count relocations for delayed sizing of relocation - sections. */ - struct elf_dyn_relocs *dyn_relocs; - enum { GOT_UNKNOWN = 0, GOT_NORMAL = 1, GOT_TLS_IE = 2, GOT_TLS_LDM = 4, GOT_TLS_GD = 8 @@ -994,7 +990,6 @@ metag_link_hash_newfunc (struct bfd_hash_entry *entry, /* Initialize the local fields. */ hh = (struct elf_metag_link_hash_entry *) entry; hh->hsh_cache = NULL; - hh->dyn_relocs = NULL; hh->tls_type = GOT_UNKNOWN; } @@ -2328,7 +2323,7 @@ elf_metag_check_relocs (bfd *abfd, /* If this is a global symbol, we count the number of relocations we need for this symbol. */ if (hh != NULL) - hdh_head = &((struct elf_metag_link_hash_entry *) hh)->dyn_relocs; + hdh_head = &hh->eh.dyn_relocs; else { /* Track dynamic relocs needed for local syms too. */ @@ -2395,41 +2390,6 @@ elf_metag_copy_indirect_symbol (struct bfd_link_info *info, hh_dir = metag_elf_hash_entry (eh_dir); hh_ind = metag_elf_hash_entry (eh_ind); - if (hh_ind->dyn_relocs != NULL) - { - if (hh_dir->dyn_relocs != NULL) - { - struct elf_dyn_relocs **hdh_pp; - struct elf_dyn_relocs *hdh_p; - - if (eh_ind->root.type == bfd_link_hash_indirect) - abort (); - - /* Add reloc counts against the weak sym to the strong sym - list. Merge any entries against the same section. */ - for (hdh_pp = &hh_ind->dyn_relocs; (hdh_p = *hdh_pp) != NULL; ) - { - struct elf_dyn_relocs *hdh_q; - - for (hdh_q = hh_dir->dyn_relocs; hdh_q != NULL; - hdh_q = hdh_q->next) - if (hdh_q->sec == hdh_p->sec) - { - hdh_q->pc_count += hdh_p->pc_count; - hdh_q->count += hdh_p->count; - *hdh_pp = hdh_p->next; - break; - } - if (hdh_q == NULL) - hdh_pp = &hdh_p->next; - } - *hdh_pp = hh_dir->dyn_relocs; - } - - hh_dir->dyn_relocs = hh_ind->dyn_relocs; - hh_ind->dyn_relocs = NULL; - } - if (eh_ind->root.type == bfd_link_hash_indirect && eh_dir->got.refcount <= 0) { @@ -2440,23 +2400,6 @@ elf_metag_copy_indirect_symbol (struct bfd_link_info *info, _bfd_elf_link_hash_copy_indirect (info, eh_dir, eh_ind); } -/* Find dynamic relocs for H that apply to read-only sections. */ - -static asection * -readonly_dynrelocs (struct elf_link_hash_entry *h) -{ - struct elf_dyn_relocs *p; - - for (p = metag_elf_hash_entry (h)->dyn_relocs; p != NULL; p = p->next) - { - asection *s = p->sec->output_section; - - if (s != NULL && (s->flags & SEC_READONLY) != 0) - return p->sec; - } - return NULL; -} - /* Adjust a symbol defined by a dynamic object and referenced by a regular object. The current definition is in some section of the dynamic object, but we're not including those sections. We have to @@ -2532,7 +2475,7 @@ elf_metag_adjust_dynamic_symbol (struct bfd_link_info *info, /* If we don't find any dynamic relocs in read-only sections, then we'll be keeping the dynamic relocs and avoiding the copy reloc. */ - if (!readonly_dynrelocs (eh)) + if (!_bfd_elf_readonly_dynrelocs (eh)) { eh->non_got_ref = 0; return TRUE; @@ -2580,7 +2523,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) { struct bfd_link_info *info; struct elf_metag_link_hash_table *htab; - struct elf_metag_link_hash_entry *hh; struct elf_dyn_relocs *hdh_p; if (eh->root.type == bfd_link_hash_indirect) @@ -2687,8 +2629,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) else eh->got.offset = (bfd_vma) -1; - hh = (struct elf_metag_link_hash_entry *) eh; - if (hh->dyn_relocs == NULL) + if (eh->dyn_relocs == NULL) return TRUE; /* If this is a -Bsymbolic shared link, then we need to discard all @@ -2702,7 +2643,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) { struct elf_dyn_relocs **hdh_pp; - for (hdh_pp = &hh->dyn_relocs; (hdh_p = *hdh_pp) != NULL; ) + for (hdh_pp = &eh->dyn_relocs; (hdh_p = *hdh_pp) != NULL; ) { hdh_p->count -= hdh_p->pc_count; hdh_p->pc_count = 0; @@ -2715,11 +2656,11 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) /* Also discard relocs on undefined weak syms with non-default visibility. */ - if (hh->dyn_relocs != NULL + if (eh->dyn_relocs != NULL && eh->root.type == bfd_link_hash_undefweak) { if (ELF_ST_VISIBILITY (eh->other) != STV_DEFAULT) - hh->dyn_relocs = NULL; + eh->dyn_relocs = NULL; /* Make sure undefined weak symbols are output as a dynamic symbol in PIEs. */ @@ -2758,14 +2699,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) goto keep; } - hh->dyn_relocs = NULL; + eh->dyn_relocs = NULL; return TRUE; keep: ; } /* Finally, allocate space. */ - for (hdh_p = hh->dyn_relocs; hdh_p != NULL; hdh_p = hdh_p->next) + for (hdh_p = eh->dyn_relocs; hdh_p != NULL; hdh_p = hdh_p->next) { asection *sreloc = elf_section_data (hdh_p->sec)->sreloc; sreloc->size += hdh_p->count * sizeof (Elf32_External_Rela); @@ -2774,33 +2715,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) return TRUE; } -/* Set DF_TEXTREL if we find any dynamic relocs that apply to - read-only sections. */ - -static bfd_boolean -maybe_set_textrel (struct elf_link_hash_entry *h, void *info_p) -{ - asection *sec; - - if (h->root.type == bfd_link_hash_indirect) - return TRUE; - - sec = readonly_dynrelocs (h); - if (sec != NULL) - { - struct bfd_link_info *info = (struct bfd_link_info *) info_p; - - info->flags |= DF_TEXTREL; - info->callbacks->minfo - (_("%pB: dynamic relocation against `%pT' in read-only section `%pA'\n"), - sec->owner, h->root.root.string, sec); - - /* Not an error, just cut short the traversal. */ - return FALSE; - } - return TRUE; -} - /* Set the sizes of the dynamic sections. */ static bfd_boolean @@ -3025,7 +2939,8 @@ elf_metag_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, /* If any dynamic relocs apply to a read-only section, then we need a DT_TEXTREL entry. */ if ((info->flags & DF_TEXTREL) == 0) - elf_link_hash_traverse (&htab->etab, maybe_set_textrel, info); + elf_link_hash_traverse (&htab->etab, + _bfd_elf_maybe_set_textrel, info); if ((info->flags & DF_TEXTREL) != 0) {