diff options
Diffstat (limited to 'gas/config/tc-mn10300.c')
| -rw-r--r-- | gas/config/tc-mn10300.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 102c2eacef84..306e90c12e72 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -1,6 +1,6 @@ /* tc-mn10300.c -- Assembler code for the Matsushita 10300 Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006 Free Software Foundation, Inc. + 2006, 2007 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,7 +19,6 @@ the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <stdio.h> #include "as.h" #include "safe-ctype.h" #include "subsegs.h" @@ -692,7 +691,7 @@ void md_show_usage (stream) FILE *stream; { - fprintf (stream, _("MN10300 options:\n\ + fprintf (stream, _("MN10300 assembler options:\n\ none yet\n")); } @@ -1020,7 +1019,7 @@ md_convert_frag (abfd, sec, fragP) int offset = fragP->fr_fix; fragP->fr_literal[offset] = 0xcc; - fix_new (fragP, fragP->fr_fix + 1, 4, fragP->fr_symbol, + fix_new (fragP, fragP->fr_fix + 1, 2, fragP->fr_symbol, fragP->fr_offset + 1, 1, BFD_RELOC_16_PCREL); fragP->fr_var = 0; fragP->fr_fix += 3; @@ -2281,17 +2280,8 @@ keep_going: abort (); } - /* Convert the size of the reloc into what fix_new_exp wants. */ - reloc_size = reloc_size / 8; - if (reloc_size == 8) - reloc_size = 0; - else if (reloc_size == 16) - reloc_size = 1; - else if (reloc_size == 32) - reloc_size = 2; - fixP = fix_new_exp (frag_now, f - frag_now->fr_literal + offset, - reloc_size, &fixups[i].exp, pcrel, + reloc_size / 8, &fixups[i].exp, pcrel, ((bfd_reloc_code_real_type) reloc)); if (pcrel) @@ -2407,7 +2397,8 @@ tc_gen_reloc (seg, fixp) break; default: - reloc->sym_ptr_ptr = (asymbol **) &bfd_abs_symbol; + reloc->sym_ptr_ptr + = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; return reloc; } } @@ -2545,7 +2536,7 @@ bfd_boolean mn10300_fix_adjustable (fixp) struct fix *fixp; { - if (! TC_RELOC_RTSYM_LOC_FIXUP (fixp)) + if (TC_FORCE_RELOCATION_LOCAL (fixp)) return 0; if (fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT |