/* ARM Mach-O support for BFD.
- Copyright (C) 2015-2016 Free Software Foundation, Inc.
+ Copyright (C) 2015-2017 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
#define bfd_mach_o_mkobject bfd_mach_o_arm_mkobject
#define bfd_mach_o_canonicalize_one_reloc bfd_mach_o_arm_canonicalize_one_reloc
-#define bfd_mach_o_swap_reloc_out NULL
+#define bfd_mach_o_swap_reloc_out NULL
#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_arm_bfd_reloc_type_lookup
#define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_arm_bfd_reloc_name_lookup
};
static bfd_boolean
-bfd_mach_o_arm_canonicalize_one_reloc (bfd *abfd,
- struct mach_o_reloc_info_external *raw,
- arelent *res, asymbol **syms)
- {
+bfd_mach_o_arm_canonicalize_one_reloc (bfd * abfd,
+ struct mach_o_reloc_info_external * raw,
+ arelent * res,
+ asymbol ** syms,
+ arelent * res_base)
+{
bfd_mach_o_reloc_info reloc;
if (!bfd_mach_o_pre_canonicalize_one_reloc (abfd, raw, &reloc, res, syms))
switch (reloc.r_type)
{
case BFD_MACH_O_ARM_RELOC_PAIR:
+ /* PR 21813: Check for a corrupt PAIR reloc at the start. */
+ if (res == res_base)
+ return FALSE;
if (reloc.r_length == 2)
{
res->howto = &arm_howto_table[7];
return TRUE;
}
return FALSE;
+
case BFD_MACH_O_ARM_RELOC_SECTDIFF:
if (reloc.r_length == 2)
{
return TRUE;
}
return FALSE;
+
case BFD_MACH_O_ARM_RELOC_LOCAL_SECTDIFF:
if (reloc.r_length == 2)
{
return TRUE;
}
return FALSE;
+
case BFD_MACH_O_ARM_RELOC_HALF_SECTDIFF:
switch (reloc.r_length)
{
return TRUE;
}
return FALSE;
+
default:
- return FALSE;
+ break;
}
}
else
return FALSE;
}
break;
+
case BFD_MACH_O_ARM_RELOC_BR24:
if (reloc.r_length == 2 && reloc.r_pcrel == 1)
{
res->howto = &arm_howto_table[11];
return TRUE;
}
- else
- return FALSE;
break;
+
case BFD_MACH_O_THUMB_RELOC_BR22:
if (reloc.r_length == 2 && reloc.r_pcrel == 1)
{
res->howto = &arm_howto_table[16];
return TRUE;
}
- else
- return FALSE;
break;
+
case BFD_MACH_O_ARM_RELOC_HALF:
if (reloc.r_pcrel == 0)
switch (reloc.r_length)
res->howto = &arm_howto_table[14];
return TRUE;
}
- return FALSE;
+ break;
+
case BFD_MACH_O_ARM_RELOC_PAIR:
if (res[-1].howto == &arm_howto_table[12]
&& reloc.r_length == 0)
res->address = res[-1].address;
return TRUE;
}
- return FALSE;
+ break;
+
default:
- return FALSE;
+ break;
}
}
+
+ return FALSE;
}
static reloc_howto_type *