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

	ALPHA_RELOC_TABLE with #ifdef RELOC_OP_P.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2cc96695d5ae07589da776ee255d9e33cb84a62d..16ef4365b3f38ed104faf79b47c4abfdbe73c63c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 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.
        (SUB_SEGMENT_ALIGN): If HANDLE_ALIGN defined, pad out last frag to
        section alignment.

diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index e44877d6228bd518e1ebc8f406eb2dcbc6136bfd..ab2d40bc17bf7f6a0f417f968dfc3ca4e2d473ea 100644 (file)
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -2648,13 +2648,16 @@ assemble_tokens (opname, tok, ntok, local_macros_on)
   int cpumatch = 1;
   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 (ntok && USER_RELOC_P (tok[ntok - 1].X_op))
     {
       reloc = ALPHA_RELOC_TABLE (tok[ntok - 1].X_op)->reloc;
       ntok--;
     }
-  else if (local_macros_on)
+  else
+#endif
+  if (local_macros_on)
     {
       macro = ((const struct alpha_macro *)
               hash_find (alpha_macro_hash, opname));