diff options
Diffstat (limited to 'bfd/coff-m68k.c')
| -rw-r--r-- | bfd/coff-m68k.c | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/bfd/coff-m68k.c b/bfd/coff-m68k.c index dbabe44..891e7a3 100644 --- a/bfd/coff-m68k.c +++ b/bfd/coff-m68k.c @@ -18,17 +18,15 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ */ - #include "bfd.h" #include "sysdep.h" #include "libbfd.h" #include "obstack.h" -#include "coff-m68k.h" -#include "internalcoff.h" +#include "coff/m68k.h" +#include "coff/internal.h" #include "libcoff.h" -static reloc_howto_type howto_table[] = + reloc_howto_type m68kcoff_howto_table[] = { HOWTO(R_RELBYTE, 0, 0, 8, false, 0, true, true,0,"8", true, 0x000000ff,0x000000ff, false), HOWTO(R_RELWORD, 0, 1, 16, false, 0, true, true,0,"16", true, 0x0000ffff,0x0000ffff, false), @@ -36,26 +34,42 @@ static reloc_howto_type howto_table[] = HOWTO(R_PCRBYTE, 0, 0, 8, true, 0, false, true,0,"DISP8", true, 0x000000ff,0x000000ff, false), HOWTO(R_PCRWORD, 0, 1, 16, true, 0, false, true,0,"DISP16", true, 0x0000ffff,0x0000ffff, false), HOWTO(R_PCRLONG, 0, 2, 32, true, 0, false, true,0,"DISP32", true, 0xffffffff,0xffffffff, false), + HOWTO(R_RELLONG_NEG, 0, -2, 32, false, 0, true, true,0,"-32", true, 0xffffffff,0xffffffff, false), }; /* Turn a howto into a reloc number */ -#define SELECT_RELOC(x,howto) { x = howto_table[howto->size +(int)howto->pc_relative*3].type; } + #define BADMAG(x) M68KBADMAG(x) #define M68 1 /* Customize coffcode.h */ -#define RTYPE2HOWTO(internal, relocentry) \ - (internal)->howto = ( howto_table + (relocentry).r_type - R_RELBYTE); +m68k_rtype2howto(internal, relocentry) +arelent *internal; +int relocentry; +{ + switch (relocentry) + { + case R_RELBYTE: (internal)->howto = ( m68kcoff_howto_table + 0);break; + case R_RELWORD: (internal)->howto = ( m68kcoff_howto_table + 1);break; + case R_RELLONG: (internal)->howto = ( m68kcoff_howto_table + 2);break; + case R_PCRBYTE: (internal)->howto = ( m68kcoff_howto_table + 3);break; + case R_PCRWORD: (internal)->howto = ( m68kcoff_howto_table + 4);break; + case R_PCRLONG: (internal)->howto = ( m68kcoff_howto_table + 5);break; + case R_RELLONG_NEG: (internal)->howto = ( m68kcoff_howto_table + 6);break; + } -#include "coffcode.h" +} + +#define RTYPE2HOWTO(internal, relocentry) m68k_rtype2howto(internal, (relocentry)->r_type) + +#include "coffcode.h" -#define coff_write_armap bsd_write_armap bfd_target m68kcoff_vec = { - "coff-m68k", /* name */ + "coff-m68k", /* name */ bfd_target_coff_flavour, true, /* data byte order is big */ true, /* header byte order is big */ @@ -65,19 +79,20 @@ bfd_target m68kcoff_vec = HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT), (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + 0, /* leading underscore */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ 3, /* minimum section alignment */ -_do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */ -_do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */ + _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */ + _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */ - {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */ - bfd_false}, - {bfd_false, coff_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, + {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ + bfd_generic_archive_p, _bfd_dummy_target}, + {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */ + bfd_false}, + {bfd_false, coff_write_object_contents, /* bfd_write_contents */ + _bfd_write_archive_contents, bfd_false}, JUMP_TABLE(coff), COFF_SWAP_TABLE -}; + }; |