diff options
| author | Alan Modra <amodra@gmail.com> | 2020-04-21 11:06:53 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-04-21 11:35:43 +0930 |
| commit | fad3d2c1b268735fe6bfa280a8e4e260fb0196a7 (patch) | |
| tree | 0684428fcd0605405ee4382be78831492fabe6bf /bfd | |
| parent | 0ff8f4b9f0839f04868aac6fa2f7ca8cf14ef7ca (diff) | |
| download | gdb-fad3d2c1b268735fe6bfa280a8e4e260fb0196a7.zip gdb-fad3d2c1b268735fe6bfa280a8e4e260fb0196a7.tar.gz gdb-fad3d2c1b268735fe6bfa280a8e4e260fb0196a7.tar.bz2 | |
Remove SH-5 remnants
git commit 211dc24b87 removed most sh5 and sh64 SuperH support, after
they were obsoleted by git commit 2b213129c5. This patch removes a
few remaining pieces that should have gone with 211dc24b87.
include/
* elf/sh.h (STO_SH5_ISA32, SHF_SH5_ISA32, SHF_SH5_ISA32_MIXED),
(SHT_SH5_CR_SORTED, STT_DATALABEL): Delete.
bfd/
* elf32-sh.c (sh_elf_relocate_section): Remove STO_SH5_ISA32
processing.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-sh.c | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 76f5630..12798e5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2020-04-21 Alan Modra <amodra@gmail.com> + + * elf32-sh.c (sh_elf_relocate_section): Remove STO_SH5_ISA32 + processing. + 2020-04-20 Stephen Casner <casner@acm.org> * pdp11.c (N_STAB): Modify value to avoid conflict with N_EXT diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index db07f8f..24e879e 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -3563,7 +3563,6 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, bfd_vma relocation; bfd_vma addend = (bfd_vma) 0; bfd_reloc_status_type r; - int seen_stt_datalabel = 0; bfd_vma off; enum got_type got_type; const char *symname = NULL; @@ -3626,14 +3625,6 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, relocation = (sec->output_section->vma + sec->output_offset + sym->st_value); - /* A local symbol never has STO_SH5_ISA32, so we don't need - datalabel processing here. Make sure this does not change - without notice. */ - if ((sym->st_other & STO_SH5_ISA32) != 0) - (*info->callbacks->reloc_dangerous) - (info, - _("unexpected STO_SH5_ISA32 on local symbol is not handled"), - input_bfd, input_section, rel->r_offset); if (sec != NULL && discarded_section (sec)) /* Handled below. */ @@ -3783,14 +3774,9 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, || sh_elf_hash_entry (h)->got_type == GOT_TLS_GD))) ; else if (sec->output_section != NULL) - relocation = ((h->root.u.def.value + relocation = (h->root.u.def.value + sec->output_section->vma - + sec->output_offset) - /* A STO_SH5_ISA32 causes a "bitor 1" to the - symbol value, unless we've seen - STT_DATALABEL on the way to it. */ - | ((h->other & STO_SH5_ISA32) != 0 - && ! seen_stt_datalabel)); + + sec->output_offset); else if (!bfd_link_relocatable (info) && (_bfd_elf_section_offset (output_bfd, info, input_section, |