diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-xstormy16.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 7c2ea41..b48a63e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2002-12-16 Andrew MacLeod <amacleod@redhat.com> + + * config/tc-xstormy16.c (md_cgen_lookup_reloc): If a relocation + has already been set up, use it. + 2002-12-16 Kazu Hirata <kazu@cs.umass.edu> * ChangeLog-9295: Fix a typo. diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c index 15d9892..592ba99 100644 --- a/gas/config/tc-xstormy16.c +++ b/gas/config/tc-xstormy16.c @@ -340,7 +340,10 @@ md_cgen_lookup_reloc (insn, operand, fixP) return fixP->fx_pcrel ? BFD_RELOC_8_PCREL : BFD_RELOC_8; case XSTORMY16_OPERAND_IMM16: + /* This might have been processed at parse time. */ fixP->fx_where += 2; + if (fixP->fx_cgen.opinfo && fixP->fx_cgen.opinfo != BFD_RELOC_NONE) + return fixP->fx_cgen.opinfo; return fixP->fx_pcrel ? BFD_RELOC_16_PCREL : BFD_RELOC_16; case XSTORMY16_OPERAND_ABS24: |