X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-vax.c;h=367e41559e980cfdbd4284c3aec17954aa31cb5a;hb=535b785fb0c97220dea23a18f07baad6b5d77ae5;hp=c28cacadda2038d90c636d788997fa0e4086283f;hpb=6d00b590316c0b08de21a264893b0fd627c54686;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c index c28cacadda..367e41559e 100644 --- a/bfd/elf32-vax.c +++ b/bfd/elf32-vax.c @@ -1,5 +1,5 @@ /* VAX series support for 32-bit ELF - Copyright (C) 1993-2014 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. Contributed by Matt Thomas . This file is part of BFD, the Binary File Descriptor library. @@ -50,13 +50,12 @@ static bfd_vma elf_vax_plt_sym_val (bfd_vma, const asection *, const arelent *); static bfd_boolean elf32_vax_set_private_flags (bfd *, flagword); -static bfd_boolean elf32_vax_merge_private_bfd_data (bfd *, bfd *); static bfd_boolean elf32_vax_print_private_bfd_data (bfd *, void *); static reloc_howto_type howto_table[] = { HOWTO (R_VAX_NONE, /* type */ 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ + 3, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ FALSE, /* pc_relative */ 0, /* bitpos */ @@ -280,11 +279,20 @@ static reloc_howto_type howto_table[] = { }; static void -rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, - Elf_Internal_Rela *dst) +rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) { - BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_VAX_max); - cache_ptr->howto = &howto_table[ELF32_R_TYPE(dst->r_info)]; + unsigned int r_type; + + r_type = ELF32_R_TYPE (dst->r_info); + if (r_type >= R_VAX_max) + { + /* xgettext:c-format */ + _bfd_error_handler (_("%B: unrecognised VAX reloc number: %d"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + r_type = R_VAX_NONE; + } + cache_ptr->howto = &howto_table[r_type]; } #define elf_info_to_howto rtype_to_howto @@ -491,8 +499,9 @@ elf32_vax_set_private_flags (bfd *abfd, flagword flags) /* Merge backend specific data from an object file to the output object file when linking. */ static bfd_boolean -elf32_vax_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +elf32_vax_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; flagword in_flags; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour @@ -552,19 +561,15 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, struct elf_link_hash_entry **sym_hashes; const Elf_Internal_Rela *rel; const Elf_Internal_Rela *rel_end; - asection *sgot; - asection *srelgot; asection *sreloc; - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; dynobj = elf_hash_table (info)->dynobj; symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); - sgot = NULL; - srelgot = NULL; sreloc = NULL; rel_end = relocs + sec->reloc_count; @@ -586,7 +591,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, /* PR15323, ref flags aren't set for references in the same object. */ - h->root.non_ir_ref = 1; + h->root.non_ir_ref_regular = 1; } switch (ELF32_R_TYPE (rel->r_info)) @@ -611,31 +616,6 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, return FALSE; } - if (sgot == NULL) - { - sgot = bfd_get_linker_section (dynobj, ".got"); - BFD_ASSERT (sgot != NULL); - } - - if (srelgot == NULL - && (h != NULL || info->shared)) - { - srelgot = bfd_get_linker_section (dynobj, ".rela.got"); - if (srelgot == NULL) - { - flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS - | SEC_IN_MEMORY | SEC_LINKER_CREATED - | SEC_READONLY); - - srelgot = bfd_make_section_anyway_with_flags (dynobj, - ".rela.got", - flags); - if (srelgot == NULL - || !bfd_set_section_alignment (dynobj, srelgot, 2)) - return FALSE; - } - } - if (h != NULL) { struct elf_vax_link_hash_entry *eh; @@ -650,11 +630,11 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, { h->got.refcount++; if (eh->got_addend != (bfd_vma) rel->r_addend) - (*_bfd_error_handler) - (_("%s: warning: GOT addend of %ld to `%s' does" + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: warning: GOT addend of %ld to `%s' does" " not match previous GOT addend of %ld"), - bfd_get_filename (abfd), rel->r_addend, - h->root.root.string, + abfd, rel->r_addend, h->root.root.string, eh->got_addend); } @@ -695,7 +675,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, will be set later (it is never cleared). We account for that possibility below by storing information in the pcrel_relocs_copied field of the hash table entry. */ - if (!(info->shared + if (!(bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0 && h != NULL && (!info->symbolic @@ -737,7 +717,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, /* If we are creating a shared library, we need to copy the reloc into the shared library. */ - if (info->shared + if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) { /* When creating a shared object, we must copy these @@ -852,7 +832,7 @@ elf_vax_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, asection *sec, const Elf_Internal_Rela *rel, *relend; bfd *dynobj; - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; dynobj = elf_hash_table (info)->dynobj; @@ -947,7 +927,7 @@ elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info, return TRUE; } - s = bfd_get_linker_section (dynobj, ".plt"); + s = elf_hash_table (info)->splt; BFD_ASSERT (s != NULL); /* If this is the first .plt entry, make room for the special @@ -962,7 +942,7 @@ elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info, location in the .plt. This is required to make function pointers compare as equal between the normal executable and the shared library. */ - if (!info->shared + if (!bfd_link_pic (info) && !h->def_regular) { h->root.u.def.section = s; @@ -977,13 +957,13 @@ elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info, /* We also need to make an entry in the .got.plt section, which will be placed in the .got section by the linker script. */ - s = bfd_get_linker_section (dynobj, ".got.plt"); + s = elf_hash_table (info)->sgotplt; BFD_ASSERT (s != NULL); s->size += 4; /* We also need to make an entry in the .rela.plt section. */ - s = bfd_get_linker_section (dynobj, ".rela.plt"); + s = elf_hash_table (info)->srelplt; BFD_ASSERT (s != NULL); s->size += sizeof (Elf32_External_Rela); @@ -1013,7 +993,7 @@ elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info, only references to the symbol are via the global offset table. For such cases we need not do anything here; the relocations will be handled correctly by relocate_section. */ - if (info->shared) + if (bfd_link_pic (info)) return TRUE; /* We must allocate the symbol in our .dynbss section, which will @@ -1043,7 +1023,7 @@ elf_vax_adjust_dynamic_symbol (struct bfd_link_info *info, h->needs_copy = 1; } - return _bfd_elf_adjust_dynamic_copy (h, s); + return _bfd_elf_adjust_dynamic_copy (info, h, s); } /* This function is called via elf_link_hash_traverse. It resets GOT @@ -1078,13 +1058,13 @@ elf_vax_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED, not actually use these entries. Reset the size of .rela.got and .got, which will cause them to get stripped from the output file below. */ - s = bfd_get_linker_section (dynobj, ".rela.got"); + s = elf_hash_table (info)->srelgot; if (s != NULL) s->size = 0; - s = bfd_get_linker_section (dynobj, ".got.plt"); + s = elf_hash_table (info)->sgotplt; if (s != NULL) s->size = 0; - s = bfd_get_linker_section (dynobj, ".got"); + s = elf_hash_table (info)->sgot; if (s != NULL) s->size = 0; } @@ -1116,7 +1096,7 @@ elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (info->executable) + if (bfd_link_executable (info) && !info->nointerp) { s = bfd_get_linker_section (dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -1129,7 +1109,7 @@ elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) relative relocs against symbols defined in a regular object. We allocated space for them in the check_relocs routine, but we will not fill them in in the relocate_section routine. */ - if (info->shared && info->symbolic) + if (bfd_link_pic (info) && info->symbolic) elf_vax_link_hash_traverse (elf_hash_table (info), elf_vax_discard_copies, NULL); @@ -1221,7 +1201,7 @@ elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) continue; /* Allocate memory for the section contents. */ - s->contents = (bfd_byte *) bfd_alloc (dynobj, s->size); + s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size); if (s->contents == NULL) return FALSE; } @@ -1236,7 +1216,7 @@ elf_vax_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) #define add_dynamic_entry(TAG, VAL) \ _bfd_elf_add_dynamic_entry (info, TAG, VAL) - if (!info->shared) + if (!bfd_link_pic (info)) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; @@ -1314,8 +1294,8 @@ elf_vax_instantiate_got_entries (struct elf_link_hash_entry *h, void * infoptr) dynobj = elf_hash_table (info)->dynobj; BFD_ASSERT (dynobj != NULL); - sgot = bfd_get_linker_section (dynobj, ".got"); - srelgot = bfd_get_linker_section (dynobj, ".rela.got"); + sgot = elf_hash_table (info)->sgot; + srelgot = elf_hash_table (info)->srelgot; if (SYMBOL_REFERENCES_LOCAL (info, h)) { @@ -1351,7 +1331,6 @@ elf_vax_relocate_section (bfd *output_bfd, Elf_Internal_Sym *local_syms, asection **local_sections) { - bfd *dynobj; Elf_Internal_Shdr *symtab_hdr; struct elf_link_hash_entry **sym_hashes; bfd_vma plt_index; @@ -1363,7 +1342,6 @@ elf_vax_relocate_section (bfd *output_bfd, Elf_Internal_Rela *rel; Elf_Internal_Rela *relend; - dynobj = elf_hash_table (info)->dynobj; symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; sym_hashes = elf_sym_hashes (input_bfd); @@ -1423,10 +1401,10 @@ elf_vax_relocate_section (bfd *output_bfd, && h->got.offset != (bfd_vma) -1 && !h->forced_local && elf_hash_table (info)->dynamic_sections_created - && (! info->shared + && (! bfd_link_pic (info) || (! info->symbolic && h->dynindx != -1) || !h->def_regular)) - || (info->shared + || (bfd_link_pic (info) && ((! info->symbolic && h->dynindx != -1) || !h->def_regular) && ((input_section->flags & SEC_ALLOC) != 0 @@ -1450,7 +1428,7 @@ elf_vax_relocate_section (bfd *output_bfd, RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, rel, 1, relend, howto, 0, contents); - if (info->relocatable) + if (bfd_link_relocatable (info)) continue; switch (r_type) @@ -1468,11 +1446,8 @@ elf_vax_relocate_section (bfd *output_bfd, { bfd_vma off; - if (sgot == NULL) - { - sgot = bfd_get_linker_section (dynobj, ".got"); - BFD_ASSERT (sgot != NULL); - } + sgot = elf_hash_table (info)->sgot; + BFD_ASSERT (sgot != NULL); off = h->got.offset; BFD_ASSERT (off < sgot->size); @@ -1494,7 +1469,7 @@ elf_vax_relocate_section (bfd *output_bfd, reloc refers to is in a shared lib, then we made a PLT entry for this symbol and need to handle the reloc like a PLT reloc. */ - if (info->shared) + if (bfd_link_pic (info)) goto r_vax_pc32_shared; /* Fall through. */ case R_VAX_PLT32: @@ -1507,17 +1482,11 @@ elf_vax_relocate_section (bfd *output_bfd, || h->plt.offset == (bfd_vma) -1) break; - if (splt == NULL) - { - splt = bfd_get_linker_section (dynobj, ".plt"); - BFD_ASSERT (splt != NULL); - } + splt = elf_hash_table (info)->splt; + BFD_ASSERT (splt != NULL); - if (sgotplt == NULL) - { - sgotplt = bfd_get_linker_section (dynobj, ".got.plt"); - BFD_ASSERT (sgotplt != NULL); - } + sgotplt = elf_hash_table (info)->sgotplt; + BFD_ASSERT (sgotplt != NULL); plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; @@ -1537,11 +1506,11 @@ elf_vax_relocate_section (bfd *output_bfd, h->plt.offset |= 1; } else if (rel->r_addend != 0) - (*_bfd_error_handler) - (_("%s: warning: PLT addend of %d to `%s' from %s section ignored"), - bfd_get_filename (input_bfd), rel->r_addend, - h->root.root.string, - bfd_get_section_name (input_bfd, input_section)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: warning: PLT addend of %d to `%s'" + " from %A section ignored"), + input_bfd, rel->r_addend, h->root.root.string, input_section); rel->r_addend = 0; break; @@ -1557,7 +1526,7 @@ elf_vax_relocate_section (bfd *output_bfd, case R_VAX_8: case R_VAX_16: case R_VAX_32: - if (info->shared + if (bfd_link_pic (info) && r_symndx != STN_UNDEF && (input_section->flags & SEC_ALLOC) != 0 && ((r_type != R_VAX_PC8 @@ -1662,17 +1631,18 @@ elf_vax_relocate_section (bfd *output_bfd, && ELF32_R_TYPE (outrel.r_info) != R_VAX_GLOB_DAT)) { if (h != NULL) - (*_bfd_error_handler) - (_("%s: warning: %s relocation against symbol `%s' from %s section"), - bfd_get_filename (input_bfd), howto->name, - h->root.root.string, - bfd_get_section_name (input_bfd, input_section)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: warning: %s relocation against symbol `%s'" + " from %A section"), + input_bfd, howto->name, h->root.root.string, + input_section); else - (*_bfd_error_handler) - (_("%s: warning: %s relocation to 0x%x from %s section"), - bfd_get_filename (input_bfd), howto->name, - outrel.r_addend, - bfd_get_section_name (input_bfd, input_section)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: warning: %s relocation to 0x%x from %A section"), + input_bfd, howto->name, outrel.r_addend, + input_section); } loc = sreloc->contents; loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela); @@ -1730,11 +1700,9 @@ elf_vax_relocate_section (bfd *output_bfd, if (*name == '\0') name = bfd_section_name (input_bfd, sec); } - if (!(info->callbacks->reloc_overflow - (info, (h ? &h->root : NULL), name, howto->name, - (bfd_vma) 0, input_bfd, input_section, - rel->r_offset))) - return FALSE; + info->callbacks->reloc_overflow + (info, (h ? &h->root : NULL), name, howto->name, + (bfd_vma) 0, input_bfd, input_section, rel->r_offset); } break; } @@ -1771,9 +1739,9 @@ elf_vax_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info, it up. */ BFD_ASSERT (h->dynindx != -1); - splt = bfd_get_linker_section (dynobj, ".plt"); - sgot = bfd_get_linker_section (dynobj, ".got.plt"); - srela = bfd_get_linker_section (dynobj, ".rela.plt"); + splt = elf_hash_table (info)->splt; + sgot = elf_hash_table (info)->sgotplt; + srela = elf_hash_table (info)->srelplt; BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL); addend = 2 * (h->plt.offset & 1); @@ -1835,8 +1803,8 @@ elf_vax_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info, /* This symbol has an entry in the global offset table. Set it up. */ - sgot = bfd_get_linker_section (dynobj, ".got"); - srela = bfd_get_linker_section (dynobj, ".rela.got"); + sgot = elf_hash_table (info)->sgot; + srela = elf_hash_table (info)->srelgot; BFD_ASSERT (sgot != NULL && srela != NULL); rela.r_offset = (sgot->output_section->vma @@ -1893,7 +1861,7 @@ elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) dynobj = elf_hash_table (info)->dynobj; - sgot = bfd_get_linker_section (dynobj, ".got.plt"); + sgot = elf_hash_table (info)->sgotplt; BFD_ASSERT (sgot != NULL); sdyn = bfd_get_linker_section (dynobj, ".dynamic"); @@ -1902,7 +1870,7 @@ elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) asection *splt; Elf32_External_Dyn *dyncon, *dynconend; - splt = bfd_get_linker_section (dynobj, ".plt"); + splt = elf_hash_table (info)->splt; BFD_ASSERT (splt != NULL && sdyn != NULL); dyncon = (Elf32_External_Dyn *) sdyn->contents; @@ -1910,7 +1878,6 @@ elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) for (; dyncon < dynconend; dyncon++) { Elf_Internal_Dyn dyn; - const char *name; asection *s; bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn); @@ -1921,37 +1888,20 @@ elf_vax_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) break; case DT_PLTGOT: - name = ".got"; + s = elf_hash_table (info)->sgotplt; goto get_vma; case DT_JMPREL: - name = ".rela.plt"; + s = elf_hash_table (info)->srelplt; get_vma: - s = bfd_get_section_by_name (output_bfd, name); - BFD_ASSERT (s != NULL); - dyn.d_un.d_ptr = s->vma; + dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; case DT_PLTRELSZ: - s = bfd_get_section_by_name (output_bfd, ".rela.plt"); - BFD_ASSERT (s != NULL); + s = elf_hash_table (info)->srelplt; dyn.d_un.d_val = s->size; bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); break; - - case DT_RELASZ: - /* The procedure linkage table relocs (DT_JMPREL) should - not be included in the overall relocs (DT_RELA). - Therefore, we override the DT_RELASZ entry here to - make it not include the JMPREL relocs. Since the - linker script arranges for .rela.plt to follow all - other relocation sections, we don't have to worry - about changing the DT_RELA entry. */ - s = bfd_get_section_by_name (output_bfd, ".rela.plt"); - if (s != NULL) - dyn.d_un.d_val -= s->size; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; } } @@ -2059,5 +2009,6 @@ elf_vax_plt_sym_val (bfd_vma i, const asection *plt, #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 16 #define elf_backend_rela_normal 1 +#define elf_backend_dtrel_excludes_plt 1 #include "elf32-target.h"