From: DJ Delorie <dj@redhat.com>
Date: Tue, 17 Dec 2002 03:55:46 +0000 (+0000)
Subject: * config/tc-xstormy16.c (md_cgen_lookup_reloc): If a relocation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bb76eb8a6e2a287775acf0188788a24d7c81dde;p=binutils-gdb.git

* 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 7c2ea410ff8..b48a63ee688 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 15d989263fe..592ba99eb8a 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: