/* M16C/M32C specific support for 32-bit ELF.
- Copyright (C) 2005-2017 Free Software Foundation, Inc.
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
#include "sysdep.h"
#include "bfd.h"
/* Forward declarations. */
static reloc_howto_type * m32c_reloc_type_lookup
(bfd *, bfd_reloc_code_real_type);
-static void m32c_info_to_howto_rela
+static bfd_boolean m32c_info_to_howto_rela
(bfd *, arelent *, Elf_Internal_Rela *);
static bfd_boolean m32c_elf_relocate_section
(bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **);
bfd_elf_generic_reloc, /* special_function */
"R_M32C_8_PCREL", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
- 0xff, /* dst_mask */
- TRUE), /* pcrel_offset */
+ 0, /* src_mask */
+ 0xff, /* dst_mask */
+ TRUE), /* pcrel_offset */
HOWTO (R_M32C_16_PCREL, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_16_PCREL", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
- 0xffff, /* dst_mask */
- TRUE), /* pcrel_offset */
+ 0, /* src_mask */
+ 0xffff, /* dst_mask */
+ TRUE), /* pcrel_offset */
HOWTO (R_M32C_8, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_8", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
+ 0, /* src_mask */
0xff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_LO16, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_LO16", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
+ 0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_HI8, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_HI8", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
+ 0, /* src_mask */
0xff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_HI16, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_HI16", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
+ 0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_RL_JUMP, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_RL_JUMP", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
- 0, /* dst_mask */
- FALSE), /* pcrel_offset */
+ 0, /* src_mask */
+ 0, /* dst_mask */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_RL_1ADDR, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_RL_1ADDR", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
- 0, /* dst_mask */
- FALSE), /* pcrel_offset */
+ 0, /* src_mask */
+ 0, /* dst_mask */
+ FALSE), /* pcrel_offset */
HOWTO (R_M32C_RL_2ADDR, /* type */
0, /* rightshift */
bfd_elf_generic_reloc, /* special_function */
"R_M32C_RL_2ADDR", /* name */
FALSE, /* partial_inplace */
- 0, /* src_mask */
- 0, /* dst_mask */
- FALSE), /* pcrel_offset */
+ 0, /* src_mask */
+ 0, /* dst_mask */
+ FALSE), /* pcrel_offset */
};
\f
{
{ BFD_RELOC_NONE, R_M32C_NONE },
{ BFD_RELOC_16, R_M32C_16 },
- { BFD_RELOC_24, R_M32C_24 },
+ { BFD_RELOC_24, R_M32C_24 },
{ BFD_RELOC_32, R_M32C_32 },
- { BFD_RELOC_8_PCREL, R_M32C_8_PCREL },
- { BFD_RELOC_16_PCREL, R_M32C_16_PCREL },
+ { BFD_RELOC_8_PCREL, R_M32C_8_PCREL },
+ { BFD_RELOC_16_PCREL, R_M32C_16_PCREL },
{ BFD_RELOC_8, R_M32C_8 },
{ BFD_RELOC_LO16, R_M32C_LO16 },
{ BFD_RELOC_HI16, R_M32C_HI16 },
static reloc_howto_type *
m32c_reloc_type_lookup
- (bfd * abfd ATTRIBUTE_UNUSED,
+ (bfd * abfd ATTRIBUTE_UNUSED,
bfd_reloc_code_real_type code)
{
unsigned int i;
/* Set the howto pointer for an M32C ELF reloc. */
-static void
-m32c_info_to_howto_rela
- (bfd * abfd ATTRIBUTE_UNUSED,
- arelent * cache_ptr,
- Elf_Internal_Rela * dst)
+static bfd_boolean
+m32c_info_to_howto_rela (bfd * abfd,
+ arelent * cache_ptr,
+ Elf_Internal_Rela * dst)
{
unsigned int r_type;
if (r_type >= (unsigned int) R_M32C_max)
{
/* xgettext:c-format */
- _bfd_error_handler (_("%B: invalid M32C reloc number: %d"), abfd, r_type);
- r_type = 0;
+ _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+ abfd, r_type);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
}
cache_ptr->howto = & m32c_elf_howto_table [r_type];
+ return TRUE;
}
\f
static bfd_boolean
m32c_elf_relocate_section
- (bfd * output_bfd ATTRIBUTE_UNUSED,
+ (bfd * output_bfd ATTRIBUTE_UNUSED,
struct bfd_link_info * info,
- bfd * input_bfd,
- asection * input_section,
- bfd_byte * contents,
+ bfd * input_bfd,
+ asection * input_section,
+ bfd_byte * contents,
Elf_Internal_Rela * relocs,
- Elf_Internal_Sym * local_syms,
- asection ** local_sections)
+ Elf_Internal_Sym * local_syms,
+ asection ** local_sections)
{
- Elf_Internal_Shdr * symtab_hdr;
+ Elf_Internal_Shdr * symtab_hdr;
struct elf_link_hash_entry ** sym_hashes;
- Elf_Internal_Rela * rel;
- Elf_Internal_Rela * relend;
+ Elf_Internal_Rela * rel;
+ Elf_Internal_Rela * relend;
asection *splt;
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
for (rel = relocs; rel < relend; rel ++)
{
- reloc_howto_type * howto;
- unsigned long r_symndx;
- Elf_Internal_Sym * sym;
- asection * sec;
+ reloc_howto_type * howto;
+ unsigned long r_symndx;
+ Elf_Internal_Sym * sym;
+ asection * sec;
struct elf_link_hash_entry * h;
- bfd_vma relocation;
- bfd_reloc_status_type r;
- const char * name = NULL;
- int r_type;
+ bfd_vma relocation;
+ bfd_reloc_status_type r;
+ const char * name = NULL;
+ int r_type;
r_type = ELF32_R_TYPE (rel->r_info);
if (bfd_link_relocatable (info))
{
/* This is a relocatable link. We don't have to change
- anything, unless the reloc is against a section symbol,
- in which case we have to adjust according to where the
- section symbol winds up in the output section. */
+ anything, unless the reloc is against a section symbol,
+ in which case we have to adjust according to where the
+ section symbol winds up in the output section. */
if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
rel->r_addend += sec->output_offset;
continue;
relocation, *plt_offset);*/
if (relocation <= 0xffff)
{
- /* If the symbol is in range for a 16-bit address, we should
+ /* If the symbol is in range for a 16-bit address, we should
have deallocated the plt entry in relax_section. */
- BFD_ASSERT (*plt_offset == (bfd_vma) -1);
+ BFD_ASSERT (*plt_offset == (bfd_vma) -1);
}
else
{
static bfd_boolean
m32c_elf_check_relocs
- (bfd * abfd,
+ (bfd * abfd,
struct bfd_link_info * info,
- asection * sec,
+ asection * sec,
const Elf_Internal_Rela * relocs)
{
- Elf_Internal_Shdr * symtab_hdr;
+ Elf_Internal_Shdr * symtab_hdr;
struct elf_link_hash_entry ** sym_hashes;
- const Elf_Internal_Rela * rel;
- const Elf_Internal_Rela * rel_end;
+ const Elf_Internal_Rela * rel;
+ const Elf_Internal_Rela * rel_end;
bfd_vma *local_plt_offsets;
asection *splt;
bfd *dynobj;
r_symndx = ELF32_R_SYM (rel->r_info);
if (r_symndx < symtab_hdr->sh_info)
- h = NULL;
+ h = NULL;
else
{
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;
-
- /* PR15323, ref flags aren't set for references in the same
- object. */
- h->root.non_ir_ref = 1;
}
switch (ELF32_R_TYPE (rel->r_info))
- {
+ {
/* This relocation describes a 16-bit pointer to a function.
We may need to allocate a thunk in low memory; reserve memory
for it now. */
splt->size += 4;
}
break;
- }
+ }
}
return TRUE;
static bfd_boolean
m32c_elf_finish_dynamic_sections (bfd *abfd ATTRIBUTE_UNUSED,
- struct bfd_link_info *info)
+ struct bfd_link_info *info)
{
bfd *dynobj = elf_hash_table (info)->dynobj;
asection *splt = elf_hash_table (info)->splt;
static bfd_boolean
m32c_elf_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
- struct bfd_link_info *info)
+ struct bfd_link_info *info)
{
bfd *dynobj;
asection *splt;
#ifdef DEBUG
_bfd_error_handler
- ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s",
+ ("old_flags = 0x%.8x, new_flags = 0x%.8x, init = %s, filename = %s",
old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no",
bfd_get_filename (ibfd));
#endif
error = TRUE;
_bfd_error_handler
/* xgettext:c-format */
- (_("%B: compiled with %s and linked with modules compiled with %s"),
+ (_("%pB: compiled with %s and linked with modules compiled with %s"),
ibfd, new_opt, old_opt);
}
error = TRUE;
_bfd_error_handler
/* xgettext:c-format */
- (_("%B: uses different e_flags (0x%lx) fields"
- " than previous modules (0x%lx)"),
- ibfd, (long) new_flags, (long) old_flags);
+ (_("%pB: uses different e_flags (%#x) fields"
+ " than previous modules (%#x)"),
+ ibfd, new_flags, old_flags);
}
}
switch (elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK)
{
case EF_M32C_CPU_M16C: return bfd_mach_m16c;
- case EF_M32C_CPU_M32C: return bfd_mach_m32c;
+ case EF_M32C_CPU_M32C: return bfd_mach_m32c;
}
return bfd_mach_m16c;
static bfd_boolean
m32c_elf_relax_plt_section (asection *splt,
- struct bfd_link_info *info,
- bfd_boolean *again)
+ struct bfd_link_info *info,
+ bfd_boolean *again)
{
struct relax_plt_data relax_plt_data;
bfd *ibfd;
for (idx = 0; idx < nlocals; ++idx)
if (local_plt_offsets[idx] != (bfd_vma) -1)
{
- local_plt_offsets[idx] = entry;
+ local_plt_offsets[idx] = entry;
entry += 4;
}
}
static bfd_boolean
m32c_elf_relax_section
- (bfd * abfd,
- asection * sec,
+ (bfd * abfd,
+ asection * sec,
struct bfd_link_info * link_info,
- bfd_boolean * again)
+ bfd_boolean * again)
{
Elf_Internal_Shdr *symtab_hdr;
Elf_Internal_Shdr *shndx_hdr;
/* The RL_ relocs must be just before the operand relocs they go
with, so we must sort them to guarantee this. */
qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela),
- compare_reloc);
+ compare_reloc);
/* Walk through them looking for relaxing opportunities. */
irelend = internal_relocs + sec->reloc_count;
*/
/* Get the value of the symbol referred to by the reloc. Just
- in case this is the last reloc in the list, use the RL's
- addend to choose between this reloc (no addend) or the next
- (yes addend, which means at least one following reloc). */
+ in case this is the last reloc in the list, use the RL's
+ addend to choose between this reloc (no addend) or the next
+ (yes addend, which means at least one following reloc). */
srel = irel + (relax_relocs ? 1 : 0);
symval = OFFSET_FOR_RELOC (srel);
static bfd_boolean
m32c_elf_relax_delete_bytes
- (bfd * abfd,
+ (bfd * abfd,
asection * sec,
bfd_vma addr,
- int count)
+ int count)
{
Elf_Internal_Shdr *symtab_hdr;
Elf_Internal_Shdr *shndx_hdr;
Elf_External_Sym_Shndx *shndx;
struct elf_link_hash_entry ** sym_hashes;
struct elf_link_hash_entry ** end_hashes;
- unsigned int symcount;
+ unsigned int symcount;
contents = elf_section_data (sec)->this_hdr.contents;
\f
/* This is for versions of gcc prior to 4.3. */
static unsigned int
-_bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
+_bfd_m32c_elf_eh_frame_address_size (bfd *abfd,
+ const asection *sec ATTRIBUTE_UNUSED)
{
if ((elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK) == EF_M32C_CPU_M16C)
return 2;
#define elf_info_to_howto m32c_info_to_howto_rela
#define elf_backend_object_p m32c_elf_object_p
#define elf_backend_relocate_section m32c_elf_relocate_section
-#define elf_backend_check_relocs m32c_elf_check_relocs
+#define elf_backend_check_relocs m32c_elf_check_relocs
#define elf_backend_object_p m32c_elf_object_p
-#define elf_symbol_leading_char ('_')
+#define elf_symbol_leading_char ('_')
#define elf_backend_always_size_sections \
m32c_elf_always_size_sections
#define elf_backend_finish_dynamic_sections \