X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-tic6x.c;h=d1ba4c2a93f12979e6216b0a0c37adb3d63c0b02;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=8381cfa76430830c37928a4e930b455c3f3356fa;hpb=c72f2fb2bb6a3e1850b081dbfce4040970fae8e6;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index 8381cfa764..d1ba4c2a93 100644 --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -1,7 +1,7 @@ /* 32-bit ELF support for TI C6X - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2020 Free Software Foundation, Inc. Contributed by Joseph Myers - Bernd Schmidt + Bernd Schmidt This file is part of BFD, the Binary File Descriptor library. @@ -43,10 +43,6 @@ struct elf32_tic6x_link_hash_table { struct elf_link_hash_table elf; - /* Short-cuts to get to dynamic linker sections. */ - asection *sdynbss; - asection *srelbss; - /* C6X specific command line arguments. */ struct elf32_tic6x_params params; @@ -65,16 +61,6 @@ struct elf32_tic6x_link_hash_table #define elf32_tic6x_hash_table(p) \ ((struct elf32_tic6x_link_hash_table *) ((p)->hash)) -/* TI C6X ELF linker hash entry. */ - -struct elf32_tic6x_link_hash_entry -{ - struct elf_link_hash_entry elf; - - /* Track dynamic relocs copied for this symbol. */ - struct elf_dyn_relocs *dyn_relocs; -}; - typedef enum { DELETE_EXIDX_ENTRY, @@ -152,7 +138,7 @@ static reloc_howto_type elf32_tic6x_howto_table[] = { HOWTO (R_C6000_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 */ @@ -820,7 +806,7 @@ static reloc_howto_type elf32_tic6x_howto_table_rel[] = { HOWTO (R_C6000_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 */ @@ -1499,7 +1485,7 @@ elf32_tic6x_reloc_name_lookup (bfd *abfd, const char *r_name) return NULL; } -static void +static bfd_boolean elf32_tic6x_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc, Elf_Internal_Rela *elf_reloc) { @@ -1507,12 +1493,28 @@ elf32_tic6x_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc, r_type = ELF32_R_TYPE (elf_reloc->r_info); if (r_type >= ARRAY_SIZE (elf32_tic6x_howto_table)) - bfd_reloc->howto = NULL; - else - bfd_reloc->howto = &elf32_tic6x_howto_table[r_type]; + { + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } + + bfd_reloc->howto = &elf32_tic6x_howto_table[r_type]; + if (bfd_reloc->howto == NULL || bfd_reloc->howto->name == NULL) + { + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; + } + + return TRUE; } -static void +static bfd_boolean elf32_tic6x_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc, Elf_Internal_Rela *elf_reloc) { @@ -1520,45 +1522,31 @@ elf32_tic6x_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc, r_type = ELF32_R_TYPE (elf_reloc->r_info); if (r_type >= ARRAY_SIZE (elf32_tic6x_howto_table_rel)) - bfd_reloc->howto = NULL; - else - bfd_reloc->howto = &elf32_tic6x_howto_table_rel[r_type]; -} - -void -elf32_tic6x_set_use_rela_p (bfd *abfd, bfd_boolean use_rela_p) -{ - elf32_tic6x_tdata (abfd)->use_rela_p = use_rela_p; -} - -/* Create an entry in a C6X ELF linker hash table. */ - -static struct bfd_hash_entry * -elf32_tic6x_link_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, - const char *string) -{ - /* Allocate the structure if it has not already been allocated by a - subclass. */ - if (entry == NULL) { - entry = bfd_hash_allocate (table, - sizeof (struct elf32_tic6x_link_hash_entry)); - if (entry == NULL) - return entry; + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } - /* Call the allocation method of the superclass. */ - entry = _bfd_elf_link_hash_newfunc (entry, table, string); - if (entry != NULL) + bfd_reloc->howto = &elf32_tic6x_howto_table_rel[r_type]; + if (bfd_reloc->howto == NULL || bfd_reloc->howto->name == NULL) { - struct elf32_tic6x_link_hash_entry *eh; - - eh = (struct elf32_tic6x_link_hash_entry *) entry; - eh->dyn_relocs = NULL; + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } - return entry; + return TRUE; +} + +void +elf32_tic6x_set_use_rela_p (bfd *abfd, bfd_boolean use_rela_p) +{ + elf32_tic6x_tdata (abfd)->use_rela_p = use_rela_p; } /* Create a C6X ELF linker hash table. */ @@ -1567,15 +1555,15 @@ static struct bfd_link_hash_table * elf32_tic6x_link_hash_table_create (bfd *abfd) { struct elf32_tic6x_link_hash_table *ret; - bfd_size_type amt = sizeof (struct elf32_tic6x_link_hash_table); + size_t amt = sizeof (struct elf32_tic6x_link_hash_table); ret = bfd_zmalloc (amt); if (ret == NULL) return NULL; if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, - elf32_tic6x_link_hash_newfunc, - sizeof (struct elf32_tic6x_link_hash_entry), + _bfd_elf_link_hash_newfunc, + sizeof (struct elf_link_hash_entry), TIC6X_ELF_DATA)) { free (ret); @@ -1591,7 +1579,7 @@ elf32_tic6x_link_hash_table_create (bfd *abfd) static bfd_boolean elf32_tic6x_final_link (bfd *abfd, struct bfd_link_info *info) { - if (info->shared) + if (bfd_link_pic (info)) { obj_attribute *out_attr; out_attr = elf_known_obj_attributes_proc (abfd); @@ -1656,18 +1644,10 @@ elf32_tic6x_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info) htab->dsbt = bfd_make_section_anyway_with_flags (dynobj, ".dsbt", flags); if (htab->dsbt == NULL - || ! bfd_set_section_alignment (dynobj, htab->dsbt, 2) - || ! bfd_set_section_alignment (dynobj, htab->elf.splt, 5)) + || !bfd_set_section_alignment (htab->dsbt, 2) + || !bfd_set_section_alignment (htab->elf.splt, 5)) return FALSE; - htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss"); - if (!info->shared) - htab->srelbss = bfd_get_linker_section (dynobj, ".rela.bss"); - - if (!htab->sdynbss - || (!info->shared && !htab->srelbss)) - abort (); - return TRUE; } @@ -1735,11 +1715,9 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, struct elf_link_hash_entry *h, Elf_Internal_Sym * sym) { - bfd *dynobj; struct elf32_tic6x_link_hash_table *htab; htab = elf32_tic6x_hash_table (info); - dynobj = htab->elf.dynobj; if (h->plt.offset != (bfd_vma) -1) { @@ -1761,7 +1739,7 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, it up. */ if ((h->dynindx == -1 - && !((h->forced_local || info->executable) + && !((h->forced_local || bfd_link_executable (info)) && h->def_regular && h->type == STT_GNU_IFUNC)) || plt == NULL @@ -1837,19 +1815,19 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, asection *srela; /* This symbol has an entry in the global offset table. - Set it up. */ + Set it up. */ - sgot = bfd_get_linker_section (dynobj, ".got"); - srela = bfd_get_linker_section (dynobj, ".rela.got"); + sgot = htab->elf.sgot; + srela = htab->elf.srelgot; BFD_ASSERT (sgot != NULL && srela != NULL); /* If this is a -Bsymbolic link, and the symbol is defined - locally, we just want to emit a RELATIVE reloc. Likewise if - the symbol was forced to be local because of a version file. - The entry in the global offset table will already have been - initialized in the relocate_section function. */ - if (info->shared - && (info->symbolic + locally, we just want to emit a RELATIVE reloc. Likewise if + the symbol was forced to be local because of a version file. + The entry in the global offset table will already have been + initialized in the relocate_section function. */ + if (bfd_link_pic (info) + && (SYMBOLIC_BIND (info, h) || h->dynindx == -1 || h->forced_local) && h->def_regular) { asection *s = h->root.u.def.section; @@ -1874,13 +1852,15 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, if (h->needs_copy) { Elf_Internal_Rela rel; + asection *s; /* This symbol needs a copy reloc. Set it up. */ if (h->dynindx == -1 || (h->root.type != bfd_link_hash_defined && h->root.type != bfd_link_hash_defweak) - || htab->srelbss == NULL) + || htab->elf.srelbss == NULL + || htab->elf.sreldynrelro == NULL) abort (); rel.r_offset = (h->root.u.def.value @@ -1888,8 +1868,12 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd, + h->root.u.def.section->output_offset); rel.r_info = ELF32_R_INFO (h->dynindx, R_C6000_COPY); rel.r_addend = 0; + if (h->root.u.def.section == htab->elf.sdynrelro) + s = htab->elf.sreldynrelro; + else + s = htab->elf.srelbss; - elf32_tic6x_install_rela (output_bfd, htab->srelbss, &rel); + elf32_tic6x_install_rela (output_bfd, s, &rel); } /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute. */ @@ -1968,7 +1952,7 @@ elf32_tic6x_fake_sections (bfd *abfd ATTRIBUTE_UNUSED, { const char * name; - name = bfd_get_section_name (abfd, sec); + name = bfd_section_name (sec); if (is_tic6x_elf_unwind_section_name (name)) { @@ -1979,90 +1963,6 @@ elf32_tic6x_fake_sections (bfd *abfd ATTRIBUTE_UNUSED, return TRUE; } -/* Update the got entry reference counts for the section being removed. */ - -static bfd_boolean -elf32_tic6x_gc_sweep_hook (bfd *abfd, - struct bfd_link_info *info, - asection *sec, - const Elf_Internal_Rela *relocs) -{ - struct elf32_tic6x_link_hash_table *htab; - Elf_Internal_Shdr *symtab_hdr; - struct elf_link_hash_entry **sym_hashes; - bfd_signed_vma *local_got_refcounts; - const Elf_Internal_Rela *rel, *relend; - - if (info->relocatable) - return TRUE; - - htab = elf32_tic6x_hash_table (info); - if (htab == NULL) - return FALSE; - - elf_section_data (sec)->local_dynrel = NULL; - - symtab_hdr = &elf_symtab_hdr (abfd); - sym_hashes = elf_sym_hashes (abfd); - local_got_refcounts = elf_local_got_refcounts (abfd); - - relend = relocs + sec->reloc_count; - for (rel = relocs; rel < relend; rel++) - { - unsigned long r_symndx; - unsigned int r_type; - struct elf_link_hash_entry *h = NULL; - - r_symndx = ELF32_R_SYM (rel->r_info); - if (r_symndx >= symtab_hdr->sh_info) - { - struct elf32_tic6x_link_hash_entry *eh; - struct elf_dyn_relocs **pp; - struct elf_dyn_relocs *p; - - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; - while (h->root.type == bfd_link_hash_indirect - || h->root.type == bfd_link_hash_warning) - h = (struct elf_link_hash_entry *) h->root.u.i.link; - eh = (struct elf32_tic6x_link_hash_entry *) h; - - for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next) - if (p->sec == sec) - { - /* Everything must go for SEC. */ - *pp = p->next; - break; - } - } - - r_type = ELF32_R_TYPE (rel->r_info); - - switch (r_type) - { - case R_C6000_SBR_GOT_U15_W: - case R_C6000_SBR_GOT_L16_W: - case R_C6000_SBR_GOT_H16_W: - case R_C6000_EHTYPE: - if (h != NULL) - { - if (h->got.refcount > 0) - h->got.refcount -= 1; - } - else if (local_got_refcounts != NULL) - { - if (local_got_refcounts[r_symndx] > 0) - local_got_refcounts[r_symndx] -= 1; - } - break; - - default: - break; - } - } - - return TRUE; -} - /* 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 @@ -2075,14 +1975,14 @@ elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info, { struct elf32_tic6x_link_hash_table *htab; bfd *dynobj; - asection *s; + asection *s, *srel; dynobj = elf_hash_table (info)->dynobj; /* Make sure we know what is going on here. */ BFD_ASSERT (dynobj != NULL && (h->needs_plt - || h->u.weakdef != NULL + || h->is_weakalias || (h->def_dynamic && h->ref_regular && !h->def_regular))); /* If this is a function, put it in the procedure linkage table. We @@ -2111,13 +2011,13 @@ elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info, /* If this is a weak symbol, and there is a real definition, the processor independent code will have arranged for us to see the real definition first, and we can just use the same value. */ - if (h->u.weakdef != NULL) + if (h->is_weakalias) { - BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined - || h->u.weakdef->root.type == bfd_link_hash_defweak); - h->root.u.def.section = h->u.weakdef->root.u.def.section; - h->root.u.def.value = h->u.weakdef->root.u.def.value; - h->non_got_ref = h->u.weakdef->non_got_ref; + struct elf_link_hash_entry *def = weakdef (h); + BFD_ASSERT (def->root.type == bfd_link_hash_defined); + h->root.u.def.section = def->root.u.def.section; + h->root.u.def.value = def->root.u.def.value; + h->non_got_ref = def->non_got_ref; return TRUE; } @@ -2128,7 +2028,7 @@ elf32_tic6x_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; /* If there are no references to this symbol that do not use the @@ -2160,15 +2060,23 @@ elf32_tic6x_adjust_dynamic_symbol (struct bfd_link_info *info, /* We must generate a R_C6000_COPY reloc to tell the dynamic linker to copy the initial value out of the dynamic object and into the runtime process image. */ + if ((h->root.u.def.section->flags & SEC_READONLY) != 0) + { + s = htab->elf.sdynrelro; + srel = htab->elf.sreldynrelro; + } + else + { + s = htab->elf.sdynbss; + srel = htab->elf.srelbss; + } if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0) { - htab->srelbss->size += sizeof (Elf32_External_Rela); + srel->size += sizeof (Elf32_External_Rela); h->needs_copy = 1; } - s = htab->sdynbss; - - return _bfd_elf_adjust_dynamic_copy (h, s); + return _bfd_elf_adjust_dynamic_copy (info, h, s); } static bfd_boolean @@ -2180,7 +2088,7 @@ elf32_tic6x_new_section_hook (bfd *abfd, asection *sec) if (!sec->used_by_bfd) { _tic6x_elf_section_data *sdata; - bfd_size_type amt = sizeof (*sdata); + size_t amt = sizeof (*sdata); sdata = (_tic6x_elf_section_data *) bfd_zalloc (abfd, amt); if (sdata == NULL) @@ -2278,6 +2186,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, bfd_reloc_status_type r; struct bfd_link_hash_entry *sbh; bfd_boolean is_rel; + bfd_boolean res; r_type = ELF32_R_TYPE (rel->r_info); r_symndx = ELF32_R_SYM (rel->r_info); @@ -2286,11 +2195,11 @@ elf32_tic6x_relocate_section (bfd *output_bfd, relocs, rel); if (is_rel) - elf32_tic6x_info_to_howto_rel (input_bfd, &bfd_reloc, rel); + res = elf32_tic6x_info_to_howto_rel (input_bfd, &bfd_reloc, rel); else - elf32_tic6x_info_to_howto (input_bfd, &bfd_reloc, rel); - howto = bfd_reloc.howto; - if (howto == NULL) + res = elf32_tic6x_info_to_howto (input_bfd, &bfd_reloc, rel); + + if (!res || (howto = bfd_reloc.howto) == NULL) { bfd_set_error (bfd_error_bad_value); return FALSE; @@ -2321,7 +2230,7 @@ elf32_tic6x_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)) { if (is_rel && sym != NULL @@ -2365,6 +2274,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, goto done_reloc; } } + /* Fall through. */ case R_C6000_PCR_S12: case R_C6000_PCR_S10: @@ -2403,7 +2313,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, case R_C6000_DSBT_INDEX: relocation = elf32_tic6x_hash_table (info)->params.dsbt_index; - if (!info->shared || relocation != 0) + if (!bfd_link_pic (info) || relocation != 0) break; /* fall through */ @@ -2416,7 +2326,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, /* When generating a shared object or relocatable executable, these relocations are copied into the output file to be resolved at run time. */ - if ((info->shared || elf32_tic6x_using_dsbt (output_bfd)) + if ((bfd_link_pic (info) || elf32_tic6x_using_dsbt (output_bfd)) && (input_section->flags & SEC_ALLOC) && (h == NULL || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT @@ -2448,8 +2358,8 @@ elf32_tic6x_relocate_section (bfd *output_bfd, memset (&outrel, 0, sizeof outrel); else if (h != NULL && h->dynindx != -1 - && (!info->shared - || !info->symbolic + && (!bfd_link_pic (info) + || !SYMBOLIC_BIND (info, h) || !h->def_regular)) { outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); @@ -2521,9 +2431,9 @@ elf32_tic6x_relocate_section (bfd *output_bfd, } else { - (*_bfd_error_handler) (_("%B: SB-relative relocation but " - "__c6xabi_DSBT_BASE not defined"), - input_bfd); + _bfd_error_handler (_("%pB: SB-relative relocation but " + "__c6xabi_DSBT_BASE not defined"), + input_bfd); ok = FALSE; continue; } @@ -2544,8 +2454,10 @@ elf32_tic6x_relocate_section (bfd *output_bfd, off = h->got.offset; dyn = htab->elf.dynamic_sections_created; - if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h) - || (info->shared + if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, + bfd_link_pic (info), + h) + || (bfd_link_pic (info) && SYMBOL_REFERENCES_LOCAL (info, h)) || (ELF_ST_VISIBILITY (h->other) && h->root.type == bfd_link_hash_undefweak)) @@ -2570,7 +2482,8 @@ elf32_tic6x_relocate_section (bfd *output_bfd, htab->elf.sgot->contents + off); h->got.offset |= 1; - if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, + if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, + bfd_link_pic (info), h) && !(ELF_ST_VISIBILITY (h->other) && h->root.type == bfd_link_hash_undefweak)) @@ -2598,7 +2511,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, bfd_put_32 (output_bfd, relocation, htab->elf.sgot->contents + off); - if (info->shared || elf32_tic6x_using_dsbt (output_bfd)) + if (bfd_link_pic (info) || elf32_tic6x_using_dsbt (output_bfd)) elf32_tic6x_make_got_dynreloc (output_bfd, htab, sec, off); local_got_offsets[r_symndx] |= 1; @@ -2626,21 +2539,23 @@ elf32_tic6x_relocate_section (bfd *output_bfd, symbols. Make this an error; the compiler isn't allowed to pass us these kinds of things. */ if (h == NULL) - (*_bfd_error_handler) - (_("%B, section %A: relocation %s with non-zero addend %d" - " against local symbol"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB, section %pA: relocation %s with non-zero addend %" + PRId64 " against local symbol"), input_bfd, input_section, elf32_tic6x_howto_table[r_type].name, - rel->r_addend); + (int64_t) rel->r_addend); else - (*_bfd_error_handler) - (_("%B, section %A: relocation %s with non-zero addend %d" - " against symbol `%s'"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB, section %pA: relocation %s with non-zero addend %" + PRId64 " against symbol `%s'"), input_bfd, input_section, elf32_tic6x_howto_table[r_type].name, - rel->r_addend, + (int64_t) rel->r_addend, h->root.root.string[0] != '\0' ? h->root.root.string : _("[whose name is lost]")); @@ -2664,8 +2579,10 @@ elf32_tic6x_relocate_section (bfd *output_bfd, /* Invalid in relocatable object. */ default: /* Unknown relocation. */ - (*_bfd_error_handler) (_("%B: invalid relocation type %d"), - input_bfd, r_type); + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + input_bfd, r_type); + bfd_set_error (bfd_error_bad_value); ok = FALSE; continue; } @@ -2707,7 +2624,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, if (name == NULL) return FALSE; if (*name == '\0') - name = bfd_section_name (input_bfd, sec); + name = bfd_section_name (sec); } switch (r) @@ -2716,20 +2633,16 @@ elf32_tic6x_relocate_section (bfd *output_bfd, /* If the overflowing reloc was to an undefined symbol, we have already printed one error message and there is no point complaining again. */ - if ((! h || - h->root.type != bfd_link_hash_undefined) - && (!((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), name, howto->name, - (bfd_vma) 0, input_bfd, input_section, - rel->r_offset)))) - return FALSE; + if (!h || h->root.type != bfd_link_hash_undefined) + (*info->callbacks->reloc_overflow) + (info, (h ? &h->root : NULL), name, howto->name, + (bfd_vma) 0, input_bfd, input_section, rel->r_offset); break; case bfd_reloc_undefined: - if (!((*info->callbacks->undefined_symbol) - (info, name, input_bfd, input_section, - rel->r_offset, TRUE))) - return FALSE; + (*info->callbacks->undefined_symbol) (info, name, input_bfd, + input_section, + rel->r_offset, TRUE); break; case bfd_reloc_outofrange: @@ -2750,10 +2663,8 @@ elf32_tic6x_relocate_section (bfd *output_bfd, common_error: BFD_ASSERT (error_message != NULL); - if (!((*info->callbacks->reloc_dangerous) - (info, error_message, input_bfd, input_section, - rel->r_offset))) - return FALSE; + (*info->callbacks->reloc_dangerous) + (info, error_message, input_bfd, input_section, rel->r_offset); break; } } @@ -2778,7 +2689,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, const Elf_Internal_Rela *rel_end; asection *sreloc; - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; htab = elf32_tic6x_hash_table (info); @@ -2787,7 +2698,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, /* Create dynamic sections for relocatable executables so that we can copy relocations. */ - if ((info->shared || elf32_tic6x_using_dsbt (abfd)) + if ((bfd_link_pic (info) || elf32_tic6x_using_dsbt (abfd)) && ! htab->elf.dynamic_sections_created) { if (! _bfd_elf_link_create_dynamic_sections (abfd, info)) @@ -2800,7 +2711,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, for (rel = relocs; rel < rel_end; rel++) { unsigned int r_type; - unsigned long r_symndx; + unsigned int r_symndx; struct elf_link_hash_entry *h; Elf_Internal_Sym *isym; @@ -2809,9 +2720,9 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { - (*_bfd_error_handler) (_("%B: bad symbol index: %d"), - abfd, - r_symndx); + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: bad symbol index: %d"), + abfd, r_symndx); return FALSE; } @@ -2831,10 +2742,6 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, while (h->root.type == bfd_link_hash_indirect || h->root.type == bfd_link_hash_warning) h = (struct elf_link_hash_entry *) h->root.u.i.link; - - /* PR15323, ref flags aren't set for references in the same - object. */ - h->root.non_ir_ref = 1; } switch (r_type) @@ -2902,7 +2809,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, store the number of R_C6000_DSBT_INDEX relocs in the pc_count field, and potentially discard the extra space in elf32_tic6x_allocate_dynrelocs. */ - if (!info->shared) + if (!bfd_link_pic (info)) break; /* fall through */ @@ -2933,7 +2840,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, may need to keep relocations for symbols satisfied by a dynamic library if we manage to avoid copy relocs for the symbol. */ - if ((info->shared || elf32_tic6x_using_dsbt (abfd)) + if ((bfd_link_pic (info) || elf32_tic6x_using_dsbt (abfd)) && (sec->flags & SEC_ALLOC) != 0) { struct elf_dyn_relocs *p; @@ -2958,7 +2865,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, relocations we need for this symbol. */ if (h != NULL) { - head = &((struct elf32_tic6x_link_hash_entry *) h)->dyn_relocs; + head = &h->dyn_relocs; } else { @@ -2979,7 +2886,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, p = *head; if (p == NULL || p->sec != sec) { - bfd_size_type amt = sizeof *p; + size_t amt = sizeof *p; p = bfd_alloc (htab->elf.dynobj, amt); if (p == NULL) return FALSE; @@ -3006,7 +2913,20 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_C6000_SBR_H16_B: case R_C6000_SBR_H16_H: case R_C6000_SBR_H16_W: - if (h != NULL && info->executable) + { + /* These relocations implicitly reference __c6xabi_DSBT_BASE. + Add an explicit reference so that the symbol will be + provided by a linker script. */ + struct bfd_link_hash_entry *bh = NULL; + if (!_bfd_generic_link_add_one_symbol (info, abfd, + "__c6xabi_DSBT_BASE", + BSF_GLOBAL, + bfd_und_section_ptr, 0, + NULL, FALSE, FALSE, &bh)) + return FALSE; + ((struct elf_link_hash_entry *) bh)->non_elf = 0; + } + if (h != NULL && bfd_link_executable (info)) { /* For B14-relative addresses, we might need a copy reloc. */ @@ -3037,7 +2957,7 @@ elf32_tic6x_add_symbol_hook (bfd *abfd, *secp = bfd_make_section_old_way (abfd, ".scommon"); (*secp)->flags |= SEC_IS_COMMON; *valp = sym->st_size; - (void) bfd_set_section_alignment (abfd, *secp, bfd_log2 (sym->st_value)); + bfd_set_section_alignment (*secp, bfd_log2 (sym->st_value)); break; } @@ -3054,18 +2974,18 @@ elf32_tic6x_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *asym) { case SHN_TIC6X_SCOMMON: if (tic6x_elf_scom_section.name == NULL) - { - /* Initialize the small common section. */ - tic6x_elf_scom_section.name = ".scommon"; - tic6x_elf_scom_section.flags = SEC_IS_COMMON; - tic6x_elf_scom_section.output_section = &tic6x_elf_scom_section; - tic6x_elf_scom_section.symbol = &tic6x_elf_scom_symbol; - tic6x_elf_scom_section.symbol_ptr_ptr = &tic6x_elf_scom_symbol_ptr; - tic6x_elf_scom_symbol.name = ".scommon"; - tic6x_elf_scom_symbol.flags = BSF_SECTION_SYM; - tic6x_elf_scom_symbol.section = &tic6x_elf_scom_section; - tic6x_elf_scom_symbol_ptr = &tic6x_elf_scom_symbol; - } + { + /* Initialize the small common section. */ + tic6x_elf_scom_section.name = ".scommon"; + tic6x_elf_scom_section.flags = SEC_IS_COMMON; + tic6x_elf_scom_section.output_section = &tic6x_elf_scom_section; + tic6x_elf_scom_section.symbol = &tic6x_elf_scom_symbol; + tic6x_elf_scom_section.symbol_ptr_ptr = &tic6x_elf_scom_symbol_ptr; + tic6x_elf_scom_symbol.name = ".scommon"; + tic6x_elf_scom_symbol.flags = BSF_SECTION_SYM; + tic6x_elf_scom_symbol.section = &tic6x_elf_scom_section; + tic6x_elf_scom_symbol_ptr = &tic6x_elf_scom_symbol; + } asym->section = &tic6x_elf_scom_section; asym->value = elfsym->internal_elf_sym.st_size; break; @@ -3093,7 +3013,7 @@ elf32_tic6x_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, int *retval) { - if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0) + if (strcmp (bfd_section_name (sec), ".scommon") == 0) { *retval = SHN_TIC6X_SCOMMON; return TRUE; @@ -3110,13 +3030,11 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) { struct bfd_link_info *info; struct elf32_tic6x_link_hash_table *htab; - struct elf32_tic6x_link_hash_entry *eh; struct elf_dyn_relocs *p; if (h->root.type == bfd_link_hash_indirect) return TRUE; - eh = (struct elf32_tic6x_link_hash_entry *) h; info = (struct bfd_link_info *) inf; htab = elf32_tic6x_hash_table (info); @@ -3130,7 +3048,7 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) return FALSE; } - if (info->shared + if (bfd_link_pic (info) || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h)) { asection *s = htab->elf.splt; @@ -3147,7 +3065,7 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) 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 && !h->def_regular) + if (! bfd_link_pic (info) && !h->def_regular) { h->root.u.def.section = s; h->root.u.def.value = h->plt.offset; @@ -3197,12 +3115,12 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) else h->got.offset = (bfd_vma) -1; - if (eh->dyn_relocs == NULL) + if (h->dyn_relocs == NULL) return TRUE; /* Discard relocs on undefined weak syms with non-default visibility. */ - if (info->shared || elf32_tic6x_using_dsbt (htab->obfd)) + if (bfd_link_pic (info) || elf32_tic6x_using_dsbt (htab->obfd)) { /* We use the pc_count field to hold the number of R_C6000_DSBT_INDEX relocs. */ @@ -3210,7 +3128,7 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) { struct elf_dyn_relocs **pp; - for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) + for (pp = &h->dyn_relocs; (p = *pp) != NULL; ) { p->count -= p->pc_count; p->pc_count = 0; @@ -3221,11 +3139,11 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) } } - if (eh->dyn_relocs != NULL + if (h->dyn_relocs != NULL && h->root.type == bfd_link_hash_undefweak) { if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) - eh->dyn_relocs = NULL; + h->dyn_relocs = NULL; /* Make sure undefined weak symbols are output as a dynamic symbol in PIEs. */ @@ -3239,7 +3157,7 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) } /* Finally, allocate space. */ - for (p = eh->dyn_relocs; p != NULL; p = p->next) + for (p = h->dyn_relocs; p != NULL; p = p->next) { asection *sreloc; @@ -3252,32 +3170,6 @@ elf32_tic6x_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) return TRUE; } -/* Find any dynamic relocs that apply to read-only sections. */ - -static bfd_boolean -elf32_tic6x_readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf) -{ - struct elf32_tic6x_link_hash_entry *eh; - struct elf_dyn_relocs *p; - - eh = (struct elf32_tic6x_link_hash_entry *) h; - for (p = eh->dyn_relocs; p != NULL; p = p->next) - { - asection *s = p->sec->output_section; - - if (s != NULL && (s->flags & SEC_READONLY) != 0) - { - struct bfd_link_info *info = (struct bfd_link_info *) inf; - - info->flags |= DF_TEXTREL; - - /* Not an error, just cut short the traversal. */ - return FALSE; - } - } - return TRUE; -} - /* Set the sizes of the dynamic sections. */ static bfd_boolean @@ -3297,7 +3189,7 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) if (htab->elf.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"); if (s == NULL) @@ -3360,7 +3252,7 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) *local_got = s->size; s->size += 4; - if (info->shared || elf32_tic6x_using_dsbt (output_bfd)) + if (bfd_link_pic (info) || elf32_tic6x_using_dsbt (output_bfd)) { srel->size += sizeof (Elf32_External_Rela); } @@ -3389,7 +3281,8 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) else if (s == htab->elf.splt || s == htab->elf.sgot || s == htab->elf.sgotplt - || s == htab->sdynbss) + || s == htab->elf.sdynbss + || s == htab->elf.sdynrelro) { /* Strip this section if we don't need it; see the comment below. */ @@ -3404,7 +3297,7 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) if (s == htab->elf.splt && s->size > 0) s->size = (s->size + 31) & ~(bfd_vma)31; } - else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela")) + else if (CONST_STRNEQ (bfd_section_name (s), ".rela")) { if (s->size != 0 && s != htab->elf.srelplt) @@ -3459,7 +3352,7 @@ elf32_tic6x_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->executable) + if (bfd_link_executable (info)) { if (!add_dynamic_entry (DT_DEBUG, 0)) return FALSE; @@ -3491,7 +3384,7 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) then we need a DT_TEXTREL entry. */ if ((info->flags & DF_TEXTREL) == 0) elf_link_hash_traverse (&htab->elf, - elf32_tic6x_readonly_dynrelocs, info); + _bfd_elf_maybe_set_textrel, info); if ((info->flags & DF_TEXTREL) != 0) { @@ -3511,7 +3404,7 @@ elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) static bfd_boolean elf32_tic6x_always_size_sections (bfd *output_bfd, struct bfd_link_info *info) { - if (elf32_tic6x_using_dsbt (output_bfd) && !info->relocatable + if (elf32_tic6x_using_dsbt (output_bfd) && !bfd_link_relocatable (info) && !bfd_elf_stack_segment_size (output_bfd, info, "__stacksize", DEFAULT_STACK_SIZE)) return FALSE; @@ -3645,7 +3538,8 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) if ((tag & 127) < 64) { _bfd_error_handler - (_("%B: error: unknown mandatory EABI object attribute %d"), + /* xgettext:c-format */ + (_("%pB: error: unknown mandatory EABI object attribute %d"), abfd, tag); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -3653,7 +3547,8 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) else { _bfd_error_handler - (_("%B: warning: unknown EABI object attribute %d"), + /* xgettext:c-format */ + (_("%pB: warning: unknown EABI object attribute %d"), abfd, tag); return TRUE; } @@ -3733,14 +3628,19 @@ elf32_tic6x_array_alignment_to_tag (int align) succeeded, FALSE otherwise. */ static bfd_boolean -elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) +elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; bfd_boolean result = TRUE; obj_attribute *in_attr; obj_attribute *out_attr; int i; int array_align_in, array_align_out, array_expect_in, array_expect_out; + /* FIXME: What should be checked when linking shared libraries? */ + if ((ibfd->flags & DYNAMIC) != 0) + return TRUE; + if (!elf_known_obj_attributes_proc (obfd)[0].i) { /* This is the first object. Copy the attributes. */ @@ -3765,7 +3665,8 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) < in_attr[Tag_ABI_stack_align_needed].i) { _bfd_error_handler - (_("error: %B requires more stack alignment than %B preserves"), + /* xgettext:c-format */ + (_("error: %pB requires more stack alignment than %pB preserves"), ibfd, obfd); result = FALSE; } @@ -3773,7 +3674,8 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) < out_attr[Tag_ABI_stack_align_needed].i) { _bfd_error_handler - (_("error: %B requires more stack alignment than %B preserves"), + /* xgettext:c-format */ + (_("error: %pB requires more stack alignment than %pB preserves"), obfd, ibfd); result = FALSE; } @@ -3783,7 +3685,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (array_align_in == -1) { _bfd_error_handler - (_("error: unknown Tag_ABI_array_object_alignment value in %B"), + (_("error: unknown Tag_ABI_array_object_alignment value in %pB"), ibfd); result = FALSE; } @@ -3792,7 +3694,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (array_align_out == -1) { _bfd_error_handler - (_("error: unknown Tag_ABI_array_object_alignment value in %B"), + (_("error: unknown Tag_ABI_array_object_alignment value in %pB"), obfd); result = FALSE; } @@ -3801,7 +3703,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (array_expect_in == -1) { _bfd_error_handler - (_("error: unknown Tag_ABI_array_object_align_expected value in %B"), + (_("error: unknown Tag_ABI_array_object_align_expected value in %pB"), ibfd); result = FALSE; } @@ -3810,7 +3712,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (array_expect_out == -1) { _bfd_error_handler - (_("error: unknown Tag_ABI_array_object_align_expected value in %B"), + (_("error: unknown Tag_ABI_array_object_align_expected value in %pB"), obfd); result = FALSE; } @@ -3818,14 +3720,16 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (array_align_out < array_expect_in) { _bfd_error_handler - (_("error: %B requires more array alignment than %B preserves"), + /* xgettext:c-format */ + (_("error: %pB requires more array alignment than %pB preserves"), ibfd, obfd); result = FALSE; } if (array_align_in < array_expect_out) { _bfd_error_handler - (_("error: %B requires more array alignment than %B preserves"), + /* xgettext:c-format */ + (_("error: %pB requires more array alignment than %pB preserves"), obfd, ibfd); result = FALSE; } @@ -3847,7 +3751,8 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) && out_attr[i].i != in_attr[i].i) { _bfd_error_handler - (_("warning: %B and %B differ in wchar_t size"), obfd, ibfd); + /* xgettext:c-format */ + (_("warning: %pB and %pB differ in wchar_t size"), obfd, ibfd); } break; @@ -3865,7 +3770,8 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) if (out_attr[i].i != in_attr[i].i) { _bfd_error_handler - (_("warning: %B and %B differ in whether code is " + /* xgettext:c-format */ + (_("warning: %pB and %pB differ in whether code is " "compiled for DSBT"), obfd, ibfd); } @@ -3873,6 +3779,9 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) case Tag_ABI_PIC: case Tag_ABI_PID: + /* Don't transfer these tags from dynamic objects. */ + if ((ibfd->flags & DYNAMIC) != 0) + continue; if (out_attr[i].i > in_attr[i].i) out_attr[i].i = in_attr[i].i; break; @@ -3919,7 +3828,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) } /* Merge Tag_ABI_compatibility attributes and any common GNU ones. */ - if (!_bfd_elf_merge_object_attributes (ibfd, obfd)) + if (!_bfd_elf_merge_object_attributes (ibfd, info)) return FALSE; result &= _bfd_elf_merge_unknown_attribute_list (ibfd, obfd); @@ -3928,15 +3837,15 @@ elf32_tic6x_merge_attributes (bfd *ibfd, bfd *obfd) } static bfd_boolean -elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +elf32_tic6x_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { - if (!_bfd_generic_verify_endian_match (ibfd, obfd)) + if (!_bfd_generic_verify_endian_match (ibfd, info)) return FALSE; - if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd)) + if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (info->output_bfd)) return TRUE; - if (!elf32_tic6x_merge_attributes (ibfd, obfd)) + if (!elf32_tic6x_merge_attributes (ibfd, info)) return FALSE; return TRUE; @@ -4003,10 +3912,10 @@ elf32_tic6x_adjust_exidx_size (asection *exidx_sec, int adjust) if (!exidx_sec->rawsize) exidx_sec->rawsize = exidx_sec->size; - bfd_set_section_size (exidx_sec->owner, exidx_sec, exidx_sec->size + adjust); + bfd_set_section_size (exidx_sec, exidx_sec->size + adjust); out_sec = exidx_sec->output_section; /* Adjust size of output section. */ - bfd_set_section_size (out_sec->owner, out_sec, out_sec->size +adjust); + bfd_set_section_size (out_sec, out_sec->size +adjust); } /* Insert an EXIDX_CANTUNWIND marker at the end of a section. */ @@ -4029,7 +3938,7 @@ elf32_tic6x_insert_cantunwind_after (asection *text_sec, asection *exidx_sec) 1. Regions without unwind data are marked with EXIDX_CANTUNWIND entries. 2. Duplicate entries are merged together (EXIDX_CANTUNWIND, or unwind - codes which have been inlined into the index). + codes which have been inlined into the index). If MERGE_EXIDX_ENTRIES is false, duplicate entries are not merged. @@ -4056,7 +3965,7 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, asection *sec; for (sec = inp->sections; sec != NULL; sec = sec->next) - { + { struct bfd_elf_section_data *elf_sec = elf_section_data (sec); Elf_Internal_Shdr *hdr = &elf_sec->this_hdr; @@ -4066,12 +3975,12 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, if (elf_sec->linked_to) { Elf_Internal_Shdr *linked_hdr - = &elf_section_data (elf_sec->linked_to)->this_hdr; + = &elf_section_data (elf_sec->linked_to)->this_hdr; struct _tic6x_elf_section_data *linked_sec_tic6x_data - = get_tic6x_elf_section_data (linked_hdr->bfd_section); + = get_tic6x_elf_section_data (linked_hdr->bfd_section); if (linked_sec_tic6x_data == NULL) - continue; + continue; /* Link this .c6xabi.exidx section back from the text section it describes. */ @@ -4089,7 +3998,7 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, asection *sec = text_section_order[i]; asection *exidx_sec; struct _tic6x_elf_section_data *tic6x_data - = get_tic6x_elf_section_data (sec); + = get_tic6x_elf_section_data (sec); struct _tic6x_elf_section_data *exidx_data; bfd_byte *contents = NULL; int deleted_exidx_bytes = 0; @@ -4100,7 +4009,7 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, bfd *ibfd; if (tic6x_data == NULL) - continue; + continue; exidx_sec = tic6x_data->u.text.tic6x_exidx_sec; if (exidx_sec == NULL) @@ -4124,11 +4033,11 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, hdr = &elf_section_data (exidx_sec)->this_hdr; if (hdr->sh_type != SHT_C6000_UNWIND) - continue; + continue; exidx_data = get_tic6x_elf_section_data (exidx_sec); if (exidx_data == NULL) - continue; + continue; ibfd = exidx_sec->owner; @@ -4179,7 +4088,7 @@ elf32_tic6x_fix_exidx_coverage (asection **text_section_order, /* Free contents if we allocated it ourselves. */ if (contents != hdr->contents) - free (contents); + free (contents); /* Record edits to be applied later (in elf32_tic6x_write_section). */ exidx_data->u.exidx.unwind_edit_list = unwind_edit_head; @@ -4373,17 +4282,17 @@ elf32_tic6x_write_section (bfd *output_bfd, #define elf_backend_can_refcount 1 #define elf_backend_want_got_plt 1 #define elf_backend_want_dynbss 1 +#define elf_backend_want_dynrelro 1 #define elf_backend_plt_readonly 1 #define elf_backend_rela_normal 1 #define elf_backend_got_header_size 8 #define elf_backend_fake_sections elf32_tic6x_fake_sections -#define elf_backend_gc_sweep_hook elf32_tic6x_gc_sweep_hook #define elf_backend_gc_mark_extra_sections elf32_tic6x_gc_mark_extra_sections #define elf_backend_create_dynamic_sections \ elf32_tic6x_create_dynamic_sections #define elf_backend_adjust_dynamic_symbol \ elf32_tic6x_adjust_dynamic_symbol -#define elf_backend_check_relocs elf32_tic6x_check_relocs +#define elf_backend_check_relocs elf32_tic6x_check_relocs #define elf_backend_add_symbol_hook elf32_tic6x_add_symbol_hook #define elf_backend_symbol_processing elf32_tic6x_symbol_processing #define elf_backend_link_output_symbol_hook \