* config/tc-xstormy16.c (md_cgen_lookup_reloc): If a relocation

has already been set up, use it.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7c2ea410ff8583e21e5b7f6390c5cd8f996bf9f7..b48a63ee688780fcc5b809c0e3cb0aaf8d553901 100644 (file)
--- 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 15d989263fe6116c575c121088575d4b7c918b74..592ba99eb8abf83d097bb74f782a48f53347fcc0 100644 (file)
--- 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: