X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-tic6x.c;h=39ca6992007dd6d84a4a00801702792b68985d5f;hb=bd420a2dfff64978feb1659d3b77c7601b98463f;hp=fccfb42d20284d5cf1c2637936adf6335249f6c4;hpb=63c1f59d665542359de4737e3e48033c588f44dc;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index fccfb42d20..39ca699200 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-2017 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. @@ -1495,7 +1495,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) { @@ -1503,12 +1503,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) { @@ -1516,9 +1532,25 @@ 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]; + { + /* 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_rel[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; } void @@ -1652,8 +1684,8 @@ 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; return TRUE; @@ -1823,17 +1855,17 @@ 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 = 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. */ + 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) @@ -1960,7 +1992,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)) { @@ -2213,6 +2245,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); @@ -2221,11 +2254,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; @@ -2457,7 +2490,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, } else { - _bfd_error_handler (_("%B: SB-relative relocation but " + _bfd_error_handler (_("%pB: SB-relative relocation but " "__c6xabi_DSBT_BASE not defined"), input_bfd); ok = FALSE; @@ -2567,21 +2600,21 @@ elf32_tic6x_relocate_section (bfd *output_bfd, if (h == NULL) _bfd_error_handler /* xgettext:c-format */ - (_("%B, section %A: relocation %s with non-zero addend %Ld" - " against local symbol"), + (_("%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 /* xgettext:c-format */ - (_("%B, section %A: relocation %s with non-zero addend %Ld" - " against symbol `%s'"), + (_("%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]")); @@ -2606,8 +2639,9 @@ elf32_tic6x_relocate_section (bfd *output_bfd, default: /* Unknown relocation. */ /* xgettext:c-format */ - _bfd_error_handler (_("%B: invalid relocation type %d"), + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), input_bfd, r_type); + bfd_set_error (bfd_error_bad_value); ok = FALSE; continue; } @@ -2649,7 +2683,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) @@ -2746,7 +2780,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { /* xgettext:c-format */ - _bfd_error_handler (_("%B: bad symbol index: %d"), + _bfd_error_handler (_("%pB: bad symbol index: %d"), abfd, r_symndx); return FALSE; } @@ -2938,6 +2972,19 @@ 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: + { + /* 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 @@ -2969,7 +3016,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; } @@ -2986,18 +3033,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; @@ -3025,7 +3072,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; @@ -3202,7 +3249,7 @@ maybe_set_textrel (struct elf_link_hash_entry *h, void *info_p) info->flags |= DF_TEXTREL; info->callbacks->minfo - (_("%B: dynamic relocation against `%T' in read-only section `%A'\n"), + (_("%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. */ @@ -3338,7 +3385,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) @@ -3579,7 +3626,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) { _bfd_error_handler /* xgettext:c-format */ - (_("%B: error: unknown mandatory EABI object attribute %d"), + (_("%pB: error: unknown mandatory EABI object attribute %d"), abfd, tag); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -3588,7 +3635,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) { _bfd_error_handler /* xgettext:c-format */ - (_("%B: warning: unknown EABI object attribute %d"), + (_("%pB: warning: unknown EABI object attribute %d"), abfd, tag); return TRUE; } @@ -3702,7 +3749,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("error: %B requires more stack alignment than %B preserves"), + (_("error: %pB requires more stack alignment than %pB preserves"), ibfd, obfd); result = FALSE; } @@ -3711,7 +3758,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("error: %B requires more stack alignment than %B preserves"), + (_("error: %pB requires more stack alignment than %pB preserves"), obfd, ibfd); result = FALSE; } @@ -3721,7 +3768,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) 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; } @@ -3730,7 +3777,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) 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; } @@ -3739,7 +3786,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) 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; } @@ -3748,7 +3795,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) 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; } @@ -3757,7 +3804,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("error: %B requires more array alignment than %B preserves"), + (_("error: %pB requires more array alignment than %pB preserves"), ibfd, obfd); result = FALSE; } @@ -3765,7 +3812,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("error: %B requires more array alignment than %B preserves"), + (_("error: %pB requires more array alignment than %pB preserves"), obfd, ibfd); result = FALSE; } @@ -3788,7 +3835,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("warning: %B and %B differ in wchar_t size"), obfd, ibfd); + (_("warning: %pB and %pB differ in wchar_t size"), obfd, ibfd); } break; @@ -3807,7 +3854,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("warning: %B and %B differ in whether code is " + (_("warning: %pB and %pB differ in whether code is " "compiled for DSBT"), obfd, ibfd); } @@ -3945,10 +3992,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. */ @@ -3971,7 +4018,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. @@ -3998,7 +4045,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; @@ -4008,12 +4055,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. */ @@ -4031,7 +4078,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; @@ -4042,7 +4089,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) @@ -4066,11 +4113,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; @@ -4121,7 +4168,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; @@ -4325,7 +4372,7 @@ elf32_tic6x_write_section (bfd *output_bfd, 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 \