From 69108c1f4363c8e7e4088d618da6837d4b5d1e00 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 23 May 2002 10:12:04 +0000 Subject: [PATCH] * config/tc-alpha.c (assemble_tokens): Protect use of ALPHA_RELOC_TABLE with #ifdef RELOC_OP_P. --- gas/ChangeLog | 3 +++ gas/config/tc-alpha.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2cc96695d5..16ef4365b3 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,8 @@ 2002-05-23 Alan Modra + * 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 e44877d622..ab2d40bc17 100644 --- 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)); -- 2.34.1