diff options
| author | Iain Sandoe <iain@codesourcery.com> | 2012-02-17 10:57:33 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@codesourcery.com> | 2012-02-17 10:57:33 +0000 |
| commit | e1e81ed3c319f765df8a755a6b901df650a4e4a0 (patch) | |
| tree | ffa1e950641420fc19abb0587860bd53b9ea1d29 /bfd/mach-o-i386.c | |
| parent | ca193e277905cd464dfd5cf1b8391017a7a861ec (diff) | |
| download | fsf-binutils-gdb-e1e81ed3c319f765df8a755a6b901df650a4e4a0.zip fsf-binutils-gdb-e1e81ed3c319f765df8a755a6b901df650a4e4a0.tar.gz fsf-binutils-gdb-e1e81ed3c319f765df8a755a6b901df650a4e4a0.tar.bz2 | |
add LOCAL SECDIFF relocation for m32 mach-o
bfd:
* reloc.c (BFD_RELOC_MACH_O_LOCAL_SECTDIFF):
* libbfd.h: Regenerated.
* bfd-in2.h: Likewise.
* mach-o-i386.c (i386_howto_table): Include local sectdiff.
(bfd_mach_o_i386_swap_reloc_in): Update for local sectdiff.
(bfd_mach_o_i386_swap_reloc_out): Likewise.
Diffstat (limited to 'bfd/mach-o-i386.c')
| -rw-r--r-- | bfd/mach-o-i386.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c index 71272eb..b681352 100644 --- a/bfd/mach-o-i386.c +++ b/bfd/mach-o-i386.c @@ -63,6 +63,7 @@ bfd_mach_o_i386_mkobject (bfd *abfd) static reloc_howto_type i386_howto_table[]= { + /* 0 */ HOWTO(BFD_RELOC_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL, "32", @@ -79,6 +80,7 @@ static reloc_howto_type i386_howto_table[]= complain_overflow_bitfield, NULL, "DISP32", FALSE, 0xffffffff, 0xffffffff, TRUE), + /* 4 */ HOWTO(BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_bitfield, NULL, "DISP16", @@ -87,6 +89,10 @@ static reloc_howto_type i386_howto_table[]= complain_overflow_bitfield, NULL, "SECTDIFF_32", FALSE, 0xffffffff, 0xffffffff, FALSE), + HOWTO(BFD_RELOC_MACH_O_LOCAL_SECTDIFF, 0, 2, 32, FALSE, 0, + complain_overflow_bitfield, + NULL, "LSECTDIFF_32", + FALSE, 0xffffffff, 0xffffffff, FALSE), HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL, "PAIR_32", @@ -103,15 +109,19 @@ bfd_mach_o_i386_swap_reloc_in (arelent *res, bfd_mach_o_reloc_info *reloc) case BFD_MACH_O_GENERIC_RELOC_PAIR: if (reloc->r_length != 2) return FALSE; - res->howto = &i386_howto_table[6]; + res->howto = &i386_howto_table[7]; res->address = res[-1].address; return TRUE; case BFD_MACH_O_GENERIC_RELOC_SECTDIFF: - case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: if (reloc->r_length != 2) return FALSE; res->howto = &i386_howto_table[5]; return TRUE; + case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: + if (reloc->r_length != 2) + return FALSE; + res->howto = &i386_howto_table[6]; + return TRUE; default: return FALSE; } @@ -183,6 +193,15 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) rinfo->r_value = (*rel->sym_ptr_ptr)->value + (*rel->sym_ptr_ptr)->section->vma; break; + case BFD_RELOC_MACH_O_LOCAL_SECTDIFF: + rinfo->r_scattered = 1; + rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF; + rinfo->r_pcrel = 0; + rinfo->r_length = 2; + rinfo->r_extern = 0; + rinfo->r_value = (*rel->sym_ptr_ptr)->value + + (*rel->sym_ptr_ptr)->section->vma; + break; case BFD_RELOC_MACH_O_PAIR: rinfo->r_address = 0; rinfo->r_scattered = 1; |