aboutsummaryrefslogtreecommitdiff
path: root/bfd/mach-o.c
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2012-11-14 10:29:46 +0000
committerTristan Gingold <gingold@adacore.com>2012-11-14 10:29:46 +0000
commitf4716ee22ef19217facb7433dc1767d19d393308 (patch)
tree3a5631f061608be52c305a30aebc405d59d08ce6 /bfd/mach-o.c
parent16efefc9e1704951fc20d18d4f66a3b3d29c933f (diff)
downloadgdb-f4716ee22ef19217facb7433dc1767d19d393308.zip
gdb-f4716ee22ef19217facb7433dc1767d19d393308.tar.gz
gdb-f4716ee22ef19217facb7433dc1767d19d393308.tar.bz2
2012-11-14 Tristan Gingold <gingold@adacore.com>
* mach-o.c (bfd_mach_o_canonicalize_one_reloc): Add a special handling for non-scattered pairs. Update comments.
Diffstat (limited to 'bfd/mach-o.c')
-rw-r--r--bfd/mach-o.c50
1 files changed, 30 insertions, 20 deletions
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 9a003e8..29ebba4 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -1018,7 +1018,7 @@ bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
addr = bfd_get_32 (abfd, raw->r_address);
res->sym_ptr_ptr = NULL;
res->addend = 0;
-
+
if (addr & BFD_MACH_O_SR_SCATTERED)
{
unsigned int j;
@@ -1056,22 +1056,35 @@ bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
else
{
unsigned int num;
-
+
/* Non-scattered relocation. */
reloc.r_scattered = 0;
-
+
/* The value and info fields have to be extracted dependent on target
endian-ness. */
bfd_mach_o_swap_in_non_scattered_reloc (abfd, &reloc, raw->r_symbolnum);
num = reloc.r_value;
if (reloc.r_extern)
- sym = syms + num;
- else if (reloc.r_scattered
- || (reloc.r_type != BFD_MACH_O_GENERIC_RELOC_PAIR))
+ {
+ /* An external symbol number. */
+ sym = syms + num;
+ }
+ else if (num == 0x00ffffff)
+ {
+ /* The 'symnum' in a non-scattered PAIR is 0x00ffffff. But as this
+ is generic code, we don't know wether this is really a PAIR.
+ This value is almost certainly not a valid section number, hence
+ this specific case to avoid an assertion failure.
+ Target specific swap_reloc_in routine should adjust that. */
+ sym = bfd_abs_section_ptr->symbol_ptr_ptr;
+ }
+ else
{
+ /* A section number. */
BFD_ASSERT (num != 0);
BFD_ASSERT (num <= mdata->nsects);
+
sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr;
/* For a symbol defined in section S, the addend (stored in the
binary) contains the address of the section. To comply with
@@ -1080,26 +1093,23 @@ bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
the vma of the section. */
res->addend = -mdata->sections[num - 1]->addr;
}
- else /* ... The 'symnum' in a non-scattered PAIR will be 0x00ffffff. */
- {
- /* Pairs for PPC LO/HI/HA are not scattered, but contain the offset
- in the lower 16bits of the address value. So we have to find the
- 'symbol' from the preceding reloc. We do this even thoough the
- section symbol is probably not needed here, because NULL symbol
- values cause an assert in generic BFD code. */
- sym = (res - 1)->sym_ptr_ptr;
- }
+ /* Note: Pairs for PPC LO/HI/HA are not scattered, but contain the offset
+ in the lower 16bits of the address value. So we have to find the
+ 'symbol' from the preceding reloc. We do this even though the
+ section symbol is probably not needed here, because NULL symbol
+ values cause an assert in generic BFD code. This must be done in
+ the PPC swap_reloc_in routine. */
res->sym_ptr_ptr = sym;
-
+
/* The 'address' is just r_address.
??? maybe this should be masked with 0xffffff for safety. */
res->address = addr;
reloc.r_address = addr;
}
-
- /* We have set up a reloc with all the information present, so the swapper can
- modify address, value and addend fields, if necessary, to convey information
- in the generic BFD reloc that is mach-o specific. */
+
+ /* We have set up a reloc with all the information present, so the swapper
+ can modify address, value and addend fields, if necessary, to convey
+ information in the generic BFD reloc that is mach-o specific. */
if (!(*bed->_bfd_mach_o_swap_reloc_in)(res, &reloc))
return -1;