+2018-04-04 Maciej W. Rozycki <macro@mips.com>
+
+ * elf32-mips.c (mips_elf32_rtype_to_howto): Also return
+ unsuccessfully for placeholder howtos.
+ * elf64-mips.c (mips_elf64_rtype_to_howto): Likewise.
+ * elfn32-mips.c (mips_elf_n32_rtype_to_howto): Likewise.
+
2018-03-29 Maciej W. Rozycki <macro@mips.com>
* elf32-mips.c (mips_info_to_howto_rel): Remove the calls to
unsigned int r_type,
bfd_boolean rela_p ATTRIBUTE_UNUSED)
{
+ reloc_howto_type *howto = NULL;
+
switch (r_type)
{
case R_MIPS_GNU_VTINHERIT:
return &elf_mips_eh_howto;
default:
if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
- return &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
+ howto = &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
- return &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
- if (r_type >= (unsigned int) R_MIPS_max)
- {
- _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
- abfd, r_type);
- bfd_set_error (bfd_error_bad_value);
- return NULL;
- }
- return &elf_mips_howto_table_rel[r_type];
+ howto = &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
+ if (r_type < R_MIPS_max)
+ howto = &elf_mips_howto_table_rel[r_type];
+ if (howto != NULL && howto->name != NULL)
+ return howto;
+
+ _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+ abfd, r_type);
+ bfd_set_error (bfd_error_bad_value);
+ return NULL;
}
}
static reloc_howto_type *
mips_elf64_rtype_to_howto (bfd *abfd, unsigned int r_type, bfd_boolean rela_p)
{
+ reloc_howto_type *howto = NULL;
+
switch (r_type)
{
case R_MIPS_GNU_VTINHERIT:
if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
{
if (rela_p)
- return µmips_elf64_howto_table_rela[r_type - R_MICROMIPS_min];
+ howto
+ = µmips_elf64_howto_table_rela[r_type - R_MICROMIPS_min];
else
- return µmips_elf64_howto_table_rel[r_type - R_MICROMIPS_min];
+ howto
+ = µmips_elf64_howto_table_rel[r_type - R_MICROMIPS_min];
}
if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
{
if (rela_p)
- return &mips16_elf64_howto_table_rela[r_type - R_MIPS16_min];
+ howto = &mips16_elf64_howto_table_rela[r_type - R_MIPS16_min];
else
- return &mips16_elf64_howto_table_rel[r_type - R_MIPS16_min];
+ howto = &mips16_elf64_howto_table_rel[r_type - R_MIPS16_min];
}
- if (r_type >= R_MIPS_max)
+ if (r_type < R_MIPS_max)
{
- _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
- abfd, r_type);
- bfd_set_error (bfd_error_bad_value);
- return NULL;
+ if (rela_p)
+ howto = &mips_elf64_howto_table_rela[r_type];
+ else
+ howto = &mips_elf64_howto_table_rel[r_type];
}
- if (rela_p)
- return &mips_elf64_howto_table_rela[r_type];
- else
- return &mips_elf64_howto_table_rel[r_type];
- break;
+ if (howto != NULL && howto->name != NULL)
+ return howto;
+
+ _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+ abfd, r_type);
+ bfd_set_error (bfd_error_bad_value);
+ return NULL;
}
}
static reloc_howto_type *
mips_elf_n32_rtype_to_howto (bfd *abfd, unsigned int r_type, bfd_boolean rela_p)
{
+ reloc_howto_type *howto = NULL;
+
switch (r_type)
{
case R_MIPS_GNU_VTINHERIT:
if (r_type >= R_MICROMIPS_min && r_type < R_MICROMIPS_max)
{
if (rela_p)
- return &elf_micromips_howto_table_rela[r_type - R_MICROMIPS_min];
+ howto = &elf_micromips_howto_table_rela[r_type - R_MICROMIPS_min];
else
- return &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
+ howto = &elf_micromips_howto_table_rel[r_type - R_MICROMIPS_min];
}
if (r_type >= R_MIPS16_min && r_type < R_MIPS16_max)
{
if (rela_p)
- return &elf_mips16_howto_table_rela[r_type - R_MIPS16_min];
+ howto = &elf_mips16_howto_table_rela[r_type - R_MIPS16_min];
else
- return &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
+ howto = &elf_mips16_howto_table_rel[r_type - R_MIPS16_min];
}
- if (r_type >= R_MIPS_max)
+ if (r_type < R_MIPS_max)
{
- _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
- abfd, r_type);
- bfd_set_error (bfd_error_bad_value);
- return NULL;
+ if (rela_p)
+ howto = &elf_mips_howto_table_rela[r_type];
+ else
+ howto = &elf_mips_howto_table_rel[r_type];
}
- if (rela_p)
- return &elf_mips_howto_table_rela[r_type];
- else
- return &elf_mips_howto_table_rel[r_type];
- break;
+ if (howto != NULL && howto->name != NULL)
+ return howto;
+
+ _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+ abfd, r_type);
+ bfd_set_error (bfd_error_bad_value);
+ return NULL;
}
}