(md_apply_fix3): Only use the insertion routine if one exists.

Ignore any error messages it may produce, just allow it to perform the insertion.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b24c1261c88638c95371e03aee6f0274c9452b7f..239d6495be0ca9c20e125a050ff0e82f691c0e43 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-18  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-v850.c (md_apply_fix3): Only use the insertion routine
+       if one exists.  Ignore any error messages it may produce, just
+       allow it to perform the insertion.
+
 2005-05-17  Zack Weinberg  <zack@codesourcery.com>
 
        * hash.c (hash_lookup): Add len parameter.  All callers changed.

diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c
index 1828396c0d5fe17c5ccd94f46453c6f2b5ecb514..aca61e959aadd88ddf80c256ef07c05112b0ad27 100644 (file)
--- a/gas/config/tc-v850.c
+++ b/gas/config/tc-v850.c
@@ -2321,8 +2321,10 @@ md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED)
       /* We still have to insert the value into memory!  */
       where = fixP->fx_frag->fr_literal + fixP->fx_where;
 
-      if (fixP->tc_fix_data != NULL)
+      if (fixP->tc_fix_data != NULL
+         && ((struct v850_operand *) fixP->tc_fix_data)->insert != NULL)
        {
+         const char * message = NULL;
          struct v850_operand * operand = (struct v850_operand *) fixP->tc_fix_data;
          unsigned long insn;
 
@@ -2339,8 +2341,8 @@ md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED)
 
          /* Use the operand's insertion procedure, if present, in order to
             make sure that the value is correctly stored in the insn.  */
-         insn = v850_insert_operand (insn, operand, (offsetT) value,
-                                     fixP->fx_file, fixP->fx_line, NULL);
+         insn = operand->insert (insn, (offsetT) value, message);
+         /* Ignore message even if it is set.  */
 
          bfd_putl32 ((bfd_vma) insn, (unsigned char *) where);
        }