+2014-06-16 Alan Modra <amodra@gmail.com>
+
+ * config/tc-vax.c (md_apply_fix): Rewrite.
+ (tc_gen_reloc, vax_cons, vax_cons_fix_new): Style: Use NO_RELOC
+ define rather than the equivalent BFD_RELOC_NONE.
+
2014-06-16 Alan Modra <amodra@gmail.com>
* config/tc-arm.c (s_arm_elf_cons): Initialise after frag_more.
{
valueT value = * valueP;
- if (((fixP->fx_addsy == NULL && fixP->fx_subsy == NULL)
- && fixP->fx_r_type != BFD_RELOC_32_PLT_PCREL
- && fixP->fx_r_type != BFD_RELOC_32_GOT_PCREL)
- || fixP->fx_r_type == NO_RELOC)
- number_to_chars_littleendian (fixP->fx_where + fixP->fx_frag->fr_literal,
- value, fixP->fx_size);
+ if (fixP->fx_subsy != (symbolS *) NULL)
+ as_bad_where (fixP->fx_file, fixP->fx_line, _("expression too complex"));
- if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
+ if (fixP->fx_addsy == NULL)
fixP->fx_done = 1;
+
+ if (fixP->fx_done)
+ number_to_chars_littleendian (fixP->fx_where + fixP->fx_frag->fr_literal,
+ value, fixP->fx_size);
+ else
+ /* Initialise the part of an instruction frag covered by the
+ relocation. (Many occurrences of frag_more followed by fix_new
+ lack any init of the frag.) Since VAX uses RELA relocs the
+ value we write into this field doesn't really matter. */
+ memset (fixP->fx_where + fixP->fx_frag->fr_literal, 0, fixP->fx_size);
}
/* Convert a number from VAX byte order (little endian)
if (fixp->fx_tcbit)
abort ();
- if (fixp->fx_r_type != BFD_RELOC_NONE)
+ if (fixp->fx_r_type != NO_RELOC)
{
code = fixp->fx_r_type;
case 2: return BFD_RELOC_16_PCREL;
case 4: return BFD_RELOC_32_PCREL;
}
- return BFD_RELOC_NONE;
+ return NO_RELOC;
}
/* This is called by emit_expr via TC_CONS_FIX_NEW when creating a
vax_cons_fix_new (fragS *frag, int where, unsigned int nbytes, expressionS *exp,
bfd_reloc_code_real_type r)
{
- if (r == BFD_RELOC_NONE)
+ if (r == NO_RELOC)
r = (nbytes == 1 ? BFD_RELOC_8
: nbytes == 2 ? BFD_RELOC_16
: BFD_RELOC_32);
Contents of section \.text:
- 0000 0000fb00 affafb00 cff5fffb 00efeeff .*
- 0010 fffffb00 ef000000 00d5afe4 d5cfe0ff .*
- 0020 d5efdaff ffffd5ef 00000000 d5afd9d5 .*
- 0030 cfddffd5 efe7ffff ffd5ef00 00000004 .*
+ 0000 0000fb00 af00fb00 cf0000fb 00ef0000 .*
+ 0010 0000fb00 ef000000 00d5af00 d5cf0000 .*
+ 0020 d5ef0000 0000d5ef 00000000 d5af00d5 .*
+ 0030 cf0000d5 ef000000 00d5ef00 00000004 .*
Contents of section \.data:
0000 00000000 00000000 00000000 0000 .*
#pass