[ARC] Reformat error messages.

gas/
2017-05-23  Claudiu Zissulescu <claziss@synopsys.com>

	* config/tc-arc.c (md_apply_fix): Use as_bad_where.
	(assemble_insn): Use as_bad.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6926e9787e8360b1f31c7d8a2060e02b014d49d7..d332c1e1e34a60ed6a91ea749c71b61a61a9b36a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-23  Claudiu Zissulescu <claziss@synopsys.com>
+
+       * config/tc-arc.c (md_apply_fix): Use as_bad_where.
+       (assemble_insn): Use as_bad.
+
 2017-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (REX_PREFIX): Changed to 7.

diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index a092892cd98680c5e14e9e1d9bcf6d4d12f4f7d7..173a1a02104a619e1a91a6e0b7ccddc1912aab6a 100644 (file)
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -2966,8 +2966,10 @@ md_apply_fix (fixS *fixP,
          break;
        default:
          if ((int) fixP->fx_r_type < 0)
-           as_fatal (_("PC relative relocation not allowed for (internal) type %d"),
-                     fixP->fx_r_type);
+           as_bad_where (fixP->fx_file, fixP->fx_line,
+                         _("PC relative relocation not allowed for (internal)"
+                           " type %d"),
+                         fixP->fx_r_type);
          break;
        }
     }
@@ -3942,9 +3944,8 @@ assemble_insn (const struct arc_opcode *opcode,
            {
            case O_plt:
              if (opcode->insn_class == JUMP)
-               as_bad_where (frag_now->fr_file, frag_now->fr_line,
-                             _("Unable to use @plt relocation for insn %s"),
-                             opcode->name);
+               as_bad (_("Unable to use @plt relocation for insn %s"),
+                       opcode->name);
              needGOTSymbol = TRUE;
              reloc = find_reloc ("plt", opcode->name,
                                  pflags, nflg,
@@ -3962,9 +3963,8 @@ assemble_insn (const struct arc_opcode *opcode,
                  reloc = ARC_RELOC_TABLE (t->X_md)->reloc;
                  if (arc_opcode_len (opcode) == 2
                      || opcode->insn_class == JUMP)
-                   as_bad_where (frag_now->fr_file, frag_now->fr_line,
-                                 _("Unable to use @pcl relocation for insn %s"),
-                                 opcode->name);
+                   as_bad (_("Unable to use @pcl relocation for insn %s"),
+                           opcode->name);
                }
              else
                {
@@ -4130,8 +4130,9 @@ assemble_insn (const struct arc_opcode *opcode,
   /* Check if the current instruction is legally used.  */
   if (arc_last_insns[1].has_delay_slot
       && is_br_jmp_insn_p (arc_last_insns[0].opcode))
-    as_bad_where (frag_now->fr_file, frag_now->fr_line,
-                 _("A jump/branch instruction in delay slot."));
+    as_bad (_("Insn %s has a jump/branch instruction %s in its delay slot."),
+           arc_last_insns[1].opcode->name,
+           arc_last_insns[0].opcode->name);
 }
 
 void