PR gas/5172

* config/tc-arc.c (md_estimate_size_before_relax): Change error message.
  (md_convert_frag): Just call abort.
* config/tc-i860.c (md_estimate_size_before_relax): Change error message.
* config/tc-i860.h (md_convert_frag): Just call abort.
* config/tc-ip2k.c (md_estimate_size_before_relax): Change error message.
  (md_convert_frag): Just call abort.
* config/tc-m68k.c (m68k_ip): Do not attempt translation of architecture names.

5 files changed, 24 insertions, 23 deletions

diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 0594aaa..7de6881 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -1033,7 +1033,7 @@ int
 md_estimate_size_before_relax (fragS *fragp ATTRIBUTE_UNUSED,
 			       asection *seg ATTRIBUTE_UNUSED)
 {
-  as_fatal (_("md_estimate_size_before_relax\n"));
+  as_fatal (_("relaxation not supported\n"));
   return 1;
 }
 
@@ -1044,7 +1044,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
 		 asection *sec ATTRIBUTE_UNUSED,
 		 fragS *fragp ATTRIBUTE_UNUSED)
 {
-  as_fatal (_("md_convert_frag\n"));
+  abort ();
 }
 
 static void
diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index 0d927de..b2ba1ec 100644
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -1031,7 +1031,7 @@ int
 md_estimate_size_before_relax (register fragS *fragP ATTRIBUTE_UNUSED,
 			       segT segtype ATTRIBUTE_UNUSED)
 {
-  as_fatal (_("i860_estimate_size_before_relax\n"));
+  as_fatal (_("relaxation not supported\n"));
 }
 
 #ifdef DEBUG_I860
diff --git a/gas/config/tc-i860.h b/gas/config/tc-i860.h
index b618f09..c261892 100644
--- a/gas/config/tc-i860.h
+++ b/gas/config/tc-i860.h
@@ -73,7 +73,7 @@ extern int target_big_endian;
 #define LOCAL_LABELS_FB		1
 #define LISTING_HEADER		"GAS for i860"
 
-#define md_convert_frag(b,s,f)  as_fatal (_("i860_convert_frag\n"));
+#define md_convert_frag(b,s,f)  abort ()
 
 /* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 37e1211..440a82d 100644
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -246,7 +246,7 @@ int
 md_estimate_size_before_relax (fragS * fragP ATTRIBUTE_UNUSED,
 			       segT    segment ATTRIBUTE_UNUSED)
 {
-  as_fatal (_("md_estimate_size_before_relax\n"));
+  as_fatal (_("relaxation not supported\n"));
   return 1;
 } 
 
@@ -269,12 +269,9 @@ md_convert_frag (bfd   * abfd  ATTRIBUTE_UNUSED,
 /* Functions concerning relocs.  */
 
 long
-md_pcrel_from (fixS *fixP)
+md_pcrel_from (fixS *fixP ATTRIBUTE_UNUSED)
 {
-  as_fatal (_("md_pcrel_from\n"));
-
-  /* Return the address of the delay slot. */
-  return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address;
+  abort ();
 }
 
 
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 11a86b9..9d422c7 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -2178,7 +2178,7 @@ m68k_ip (char *instring)
 
 	      the_ins.error = buf;
 	      /* Make sure there's a NUL at the end of the buffer -- strncpy
-		 won't write one when it runs out of buffer */
+		 won't write one when it runs out of buffer.  */
 	      buf[space] = 0;
 #define APPEND(STRING) \
   (strncpy (buf, STRING, space), len = strlen (buf), buf += len, space -= len)
@@ -2187,37 +2187,41 @@ m68k_ip (char *instring)
 	      switch (ok_arch)
 		{
 		case mcfisa_a:
-		  APPEND (_("ColdFire ISA_A"));
+		  APPEND ("ColdFire ISA_A");
 		  break;
 		case mcfhwdiv:
-		  APPEND (_("ColdFire hardware divide"));
+		  APPEND ("ColdFire ");
+		  APPEND (_("hardware divide"));
 		  break;
 		case mcfisa_aa:
-		  APPEND (_("ColdFire ISA_A+"));
+		  APPEND ("ColdFire ISA_A+");
 		  break;
 		case mcfisa_b:
-		  APPEND (_("ColdFire ISA_B"));
+		  APPEND ("ColdFire ISA_B");
 		  break;
 		case mcfisa_c:
-		  APPEND (_("ColdFire ISA_C"));
+		  APPEND ("ColdFire ISA_C");
 		  break;
 		case cfloat:
-		  APPEND (_("ColdFire fpu"));
+		  APPEND ("ColdFire fpu");
 		  break;
 		case mfloat:
-		  APPEND (_("M68K fpu"));
+		  APPEND ("M68K fpu");
 		  break;
 		case mmmu:
-		  APPEND (_("M68K mmu"));
+		  APPEND ("M68K mmu");
 		  break;
 		case m68020up:
-		  APPEND (_("68020 or higher"));
+		  APPEND ("68020 ");
+		  APPEND (_("or higher"));
 		  break;
 		case m68000up:
-		  APPEND (_("68000 or higher"));
+		  APPEND ("68000 ");
+		  APPEND (_("or higher"));
 		  break;
 		case m68010up:
-		  APPEND (_("68010 or higher"));
+		  APPEND ("68010 ");
+		  APPEND (_("or higher"));
 		  break;
 		default:
 		  paren = 0;
@@ -2261,7 +2265,7 @@ m68k_ip (char *instring)
 #undef APPEND
 	      if (!space)
 		{
-		  /* we ran out of space, so replace the end of the list
+		  /* We ran out of space, so replace the end of the list
 		     with ellipsis.  */
 		  buf -= 4;
 		  while (*buf != ' ')