diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2002-05-23 10:12:04 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2002-05-23 10:12:04 +0000 |
| commit | 6e6c7490a1bd346a2c59ec4a3777e148f5bc1a99 (patch) | |
| tree | 0fbc975e09e723edc610c061b1c433049577b121 | |
| parent | ed5d17a740873c72604f03c0e2ec7a12f87c091b (diff) | |
| download | binutils-redhat-6e6c7490a1bd346a2c59ec4a3777e148f5bc1a99.tar.gz | |
* config/tc-alpha.c (assemble_tokens): Protect use of
ALPHA_RELOC_TABLE with #ifdef RELOC_OP_P.
| -rw-r--r-- | gas/ChangeLog | 3 | ||||
| -rw-r--r-- | gas/config/tc-alpha.c | 5 |
2 files changed, 7 insertions, 1 deletions
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 <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 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)); |