* config/tc-alpha.c (assemble_tokens): Protect use of

ALPHA_RELOC_TABLE with #ifdef RELOC_OP_P.
This commit is contained in:
Alan Modra
2002-05-23 10:12:04 +00:00
parent 68b2fc7af6
commit 69108c1f43
2 changed files with 7 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2002-05-23 Alan Modra <amodra@bigpond.net.au> 2002-05-23 Alan Modra <amodra@bigpond.net.au>
* config/tc-alpha.c (assemble_tokens): Protect use of
ALPHA_RELOC_TABLE with #ifdef RELOC_OP_P.
* write.c (size_seg): Check adjustment to last frag. * write.c (size_seg): Check adjustment to last frag.
(SUB_SEGMENT_ALIGN): If HANDLE_ALIGN defined, pad out last frag to (SUB_SEGMENT_ALIGN): If HANDLE_ALIGN defined, pad out last frag to
section alignment. section alignment.

View File

@ -2648,13 +2648,16 @@ assemble_tokens (opname, tok, ntok, local_macros_on)
int cpumatch = 1; int cpumatch = 1;
bfd_reloc_code_real_type reloc = BFD_RELOC_UNUSED; bfd_reloc_code_real_type reloc = BFD_RELOC_UNUSED;
#ifdef RELOC_OP_P
/* If a user-specified relocation is present, this is not a macro. */ /* If a user-specified relocation is present, this is not a macro. */
if (ntok && USER_RELOC_P (tok[ntok - 1].X_op)) if (ntok && USER_RELOC_P (tok[ntok - 1].X_op))
{ {
reloc = ALPHA_RELOC_TABLE (tok[ntok - 1].X_op)->reloc; reloc = ALPHA_RELOC_TABLE (tok[ntok - 1].X_op)->reloc;
ntok--; ntok--;
} }
else if (local_macros_on) else
#endif
if (local_macros_on)
{ {
macro = ((const struct alpha_macro *) macro = ((const struct alpha_macro *)
hash_find (alpha_macro_hash, opname)); hash_find (alpha_macro_hash, opname));