X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf-s390-common.c;h=8795fb9a0485521ba6106debb3fca542af76b2d1;hb=555cb1688148f41582b1e7e9af57e2fc3fbf21bf;hp=c74883cde273bcfb1e2154267f6d1f59bd1ea46b;hpb=f1885d1e59a7e6e0627429cd3068740d96f8a184;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c index c74883cde2..8795fb9a04 100644 --- a/bfd/elf-s390-common.c +++ b/bfd/elf-s390-common.c @@ -1,5 +1,5 @@ /* IBM S/390-specific support for ELF 32 and 64 bit functions - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2017 Free Software Foundation, Inc. Contributed by Andreas Krebbel. This file is part of BFD, the Binary File Descriptor library. @@ -45,7 +45,7 @@ s390_elf_create_ifunc_sections (bfd *abfd, struct bfd_link_info *info) flags = bed->dynamic_sec_flags; - if (info->shared) + if (bfd_link_pic (info)) { s = bfd_make_section_with_flags (abfd, ".rela.ifunc", flags | SEC_READONLY); @@ -87,12 +87,12 @@ s390_elf_create_ifunc_sections (bfd *abfd, struct bfd_link_info *info) static bfd_boolean s390_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, - struct elf_link_hash_entry *h, - struct elf_dyn_relocs **head) + struct elf_link_hash_entry *h) { struct elf_dyn_relocs *p; struct elf_link_hash_table *htab; struct elf_s390_link_hash_entry *eh = (struct elf_s390_link_hash_entry*)h; + struct elf_dyn_relocs **head = &eh->dyn_relocs; htab = elf_hash_table (info); eh->ifunc_resolver_address = h->root.u.def.value; @@ -105,7 +105,7 @@ s390_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, where it is marked with regular reference, but not non-GOT reference. It may happen if we didn't see STT_GNU_IFUNC symbol at the time when checking relocations. */ - if (info->shared + if (bfd_link_pic (info) && !h->non_got_ref && h->ref_regular) for (p = *head; p != NULL; p = p->next) @@ -151,7 +151,9 @@ keep: point to the IPLT slot. That way the referencing shared lib will always get the PLT slot address when resolving the respective R_390_GLOB_DAT/R_390_64 relocs on that symbol. */ - if (info->executable && !info->shared && h->def_regular && h->ref_dynamic) + if (bfd_link_pde (info) + && h->def_regular + && h->ref_dynamic) { h->root.u.def.section = htab->iplt; h->root.u.def.value = h->plt.offset; @@ -159,9 +161,7 @@ keep: h->type = STT_FUNC; } - /* We need dynamic relocation for STT_GNU_IFUNC symbol only when - there is a non-GOT reference in a shared object. */ - if (!info->shared || !h->non_got_ref) + if (!bfd_link_pic (info)) *head = NULL; /* Finally, allocate space. */ @@ -182,9 +182,9 @@ keep: avoided if the values in the GOT slots could differ for pointer equality reasons. */ if (h->got.refcount <= 0 - || (info->shared + || (bfd_link_pic (info) && (h->dynindx == -1 || h->forced_local)) - || (info->executable && info->shared) + || bfd_link_pie (info) || htab->sgot == NULL) { /* Use .got.iplt. */ @@ -194,7 +194,7 @@ keep: { h->got.offset = htab->sgot->size; htab->sgot->size += GOT_ENTRY_SIZE; - if (info->shared) + if (bfd_link_pic (info)) htab->srelgot->size += RELA_ENTRY_SIZE; } @@ -234,11 +234,84 @@ elf_s390_add_symbol_hook (bfd *abfd, asection **secp ATTRIBUTE_UNUSED, bfd_vma *valp ATTRIBUTE_UNUSED) { - if ((ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC - || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) + if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC && (abfd->flags & DYNAMIC) == 0 && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) - elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; + elf_tdata (info->output_bfd)->has_gnu_symbols |= elf_gnu_symbol_ifunc; + + return TRUE; +} + +/* Whether to sort relocs output by ld -r or ld --emit-relocs, by + r_offset. Don't do so for code sections. We want to keep ordering + of GDCALL / PLT32DBL for TLS optimizations as is. On the other + hand, elf-eh-frame.c processing requires .eh_frame relocs to be + sorted. */ + +static bfd_boolean +elf_s390_elf_sort_relocs_p (asection *sec) +{ + return (sec->flags & SEC_CODE) == 0; +} + +/* Merge object attributes from IBFD into OBFD. Raise an error if + there are conflicting attributes. */ +static bfd_boolean +elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) +{ + bfd *obfd = info->output_bfd; + obj_attribute *in_attr, *in_attrs; + obj_attribute *out_attr, *out_attrs; + + if (!elf_known_obj_attributes_proc (obfd)[0].i) + { + /* This is the first object. Copy the attributes. */ + _bfd_elf_copy_obj_attributes (ibfd, obfd); + + /* Use the Tag_null value to indicate the attributes have been + initialized. */ + elf_known_obj_attributes_proc (obfd)[0].i = 1; + + return TRUE; + } + + in_attrs = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU]; + out_attrs = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU]; + + /* Check for conflicting Tag_GNU_S390_ABI_Vector attributes and + merge non-conflicting ones. */ + in_attr = &in_attrs[Tag_GNU_S390_ABI_Vector]; + out_attr = &out_attrs[Tag_GNU_S390_ABI_Vector]; + + if (in_attr->i > 2) + _bfd_error_handler + /* xgettext:c-format */ + (_("Warning: %B uses unknown vector ABI %d"), ibfd, + in_attr->i); + else if (out_attr->i > 2) + _bfd_error_handler + /* xgettext:c-format */ + (_("Warning: %B uses unknown vector ABI %d"), obfd, + out_attr->i); + else if (in_attr->i != out_attr->i) + { + out_attr->type = ATTR_TYPE_FLAG_INT_VAL; + + if (in_attr->i && out_attr->i) + { + const char abi_str[3][9] = { "none", "software", "hardware" }; + + _bfd_error_handler + /* xgettext:c-format */ + (_("Warning: %B uses vector %s ABI, %B uses %s ABI"), + ibfd, abi_str[in_attr->i], obfd, abi_str[out_attr->i]); + } + if (in_attr->i > out_attr->i) + out_attr->i = in_attr->i; + } + + /* Merge Tag_compatibility attributes and any common GNU ones. */ + _bfd_elf_merge_object_attributes (ibfd, info); return TRUE; }