From: Kevin Buettner <kevinb@redhat.com>
Date: Sun, 25 Feb 2001 04:45:12 +0000 (+0000)
Subject: Replace calls to abort() with calls to internal_error().
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=e1e9e218c189882084a89fdee655a0a523efbaf8;p=deliverable%2Fbinutils-gdb.git

Replace calls to abort() with calls to internal_error().
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c82f452bd0..6210821693 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,52 @@
+2001-02-24  Kevin Buettner  <kevinb@redhat.com>
+
+	* buildsym.c (push_subfile, pop_subfile): Replace call to abort()
+	with call to internal_error().
+	* dbxread.c (process_one_symbol): Likewise.
+	* exec.c (build_section_table, xfer_memory): Likewise.
+	* h8500-tdep.c (h8500_register_size, h8500_register_virtual_type):
+	Likewise.
+	* hpread.c (hpread_type_translate, hpread_read_array_type)
+	(hpread_type_lookup): Likewise.
+	* i386-tdep.c (gdb_print_insn_i386): Likewise.
+	* i960-tdep.c (mem): Likewise
+	* inflow.c (set_sigio_trap, clear_sigio_trap): Likewise.
+	* infptrace.c (child_resume): Likewise.
+	* infttrace.c (_initialize_infttrace): Likewise.
+	* language.c (binop_result_type, add_language): Likewise.
+	* lynx-nat.c (store_inferior_registers): Likewise.
+	* m3-nat.c (port_chain_insert, m3_trace_me): Likewise.
+	* mdebugread.c (parse_partial_symbols): Likewise.
+	* monitor.c (monitor_printf_noecho, monitor_printf)
+	(monitor_dump_regs): Likewise.
+	* ocd.c (stu_put_packet): Likewise.
+	* printcmd.c (decode_format, print_scalar_formatted): Likewise.
+	* remote-bug.c (bug_open): Likewise.
+	* remote-e7000.c (fetch_regs_from_dump, e7000_wait): Likewise.
+	* remote-es.c (es1800_read_bytes): Likewise.
+	* remote-mips.c (common_breakpoint): Likewise.
+	* remote-rdp.c (send_rdp): Likewise.
+	* remote-sds.c (putmessage): Likewise.
+	* sparc-nat.c (fetch_inferior_registers, store_inferior_registers):
+	Likewise.
+	* sparcl-tdep.c (sparclite_download): Likewise.
+	* symtab.c (lookup_partial_symbol): Likewise.
+	* target.c (push_target, pop_target, initialize_targets): Likewise.
+	* utils.c (internal_verror, malloc_botch, wrap_here, decimal2str):
+	Likewise.
+	* valprint.c (print_decimal, print_longest, print_longest)
+	(strcat_longest): Likewise.
+	* w65-tdep.c (init_frame_pc, w65_push_dummy_frame): Likewise.
+	* xmodem.c (xmodem_send_packet): Likewise.
+	* z8k-tdep.c (init_frame_pc, z8k_push_dummy_frame): Likewise.
+	* config/h8500/tm-h8500.h (STORE_STRUCT_RETURN): Likewise.
+	* config/mn10200/tm-mn10200.h (EXTRACT_RETURN_VALUE)
+	(STORE_RETURN_VALUE): Likewise.
+	* config/ns32k/nm-umax.h (REGISTER_U_ADDR): Likewise.
+	* config/ns32k/xm-merlin.h (REGISTER_U_ADDR): Likewise.
+	* config/z8k/tm-z8k.h (STORE_STRUCT_RETURN, STORE_RETURN_VALUE):
+	Likewise.
+
 2001-02-23  Andrew Cagney  <ac131313@redhat.com>
 
 	* CONTRIBUTE: Document how to cite a problem report.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 24ef12a708..4195dfc712 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -667,7 +667,7 @@ push_subfile (void)
   subfile_stack = tem;
   if (current_subfile == NULL || current_subfile->name == NULL)
     {
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
   tem->name = current_subfile->name;
 }
@@ -680,7 +680,7 @@ pop_subfile (void)
 
   if (link == NULL)
     {
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
   name = link->name;
   subfile_stack = link->next;
diff --git a/gdb/config/h8500/tm-h8500.h b/gdb/config/h8500/tm-h8500.h
index 00eb21826a..8a47cf972d 100644
--- a/gdb/config/h8500/tm-h8500.h
+++ b/gdb/config/h8500/tm-h8500.h
@@ -159,7 +159,7 @@ extern struct type *h8500_register_virtual_type (int regno);
    subroutine will return.  This is called from call_function. */
 
 /*#define STORE_STRUCT_RETURN(ADDR, SP) \
-   { write_register (0, (ADDR)); abort(); } */
+   { write_register (0, (ADDR)); internal_error (__FILE__, __LINE__, "failed internal consistency check"); } */
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
diff --git a/gdb/config/mn10200/tm-mn10200.h b/gdb/config/mn10200/tm-mn10200.h
index 5c26a003fc..d7cc9395ea 100644
--- a/gdb/config/mn10200/tm-mn10200.h
+++ b/gdb/config/mn10200/tm-mn10200.h
@@ -122,7 +122,7 @@ extern CORE_ADDR mn10200_frame_saved_pc (struct frame_info *);
 #define EXTRACT_RETURN_VALUE(TYPE, REGBUF, VALBUF) \
   { \
     if (TYPE_LENGTH (TYPE) > 8) \
-      abort (); \
+      internal_error (__FILE__, __LINE__, "failed internal consistency check"); \
     else if (TYPE_LENGTH (TYPE) > 2 && TYPE_CODE (TYPE) != TYPE_CODE_PTR) \
       { \
 	memcpy (VALBUF, REGBUF + REGISTER_BYTE (0), 2); \
@@ -145,7 +145,7 @@ extern CORE_ADDR mn10200_frame_saved_pc (struct frame_info *);
 #define STORE_RETURN_VALUE(TYPE, VALBUF) \
   { \
     if (TYPE_LENGTH (TYPE) > 8) \
-      abort (); \
+      internal_error (__FILE__, __LINE__, "failed internal consistency check"); \
     else if (TYPE_LENGTH (TYPE) > 2 && TYPE_CODE (TYPE) != TYPE_CODE_PTR) \
       { \
 	write_register_bytes (REGISTER_BYTE (0), VALBUF, 2); \
diff --git a/gdb/config/ns32k/nm-umax.h b/gdb/config/ns32k/nm-umax.h
index 76f0c4193d..5c02831ee1 100644
--- a/gdb/config/ns32k/nm-umax.h
+++ b/gdb/config/ns32k/nm-umax.h
@@ -50,6 +50,6 @@
   	addr = PU_F0 + (regno - LP0_REGNUM) * sizeof (double); break;	\
   default:								\
   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	abort ();							\
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
   }									\
 }
diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
index 83a810caff..6664d8cb43 100644
--- a/gdb/config/ns32k/xm-merlin.h
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -61,6 +61,6 @@
   	addr = 76 + (regno - LP0_REGNUM) * sizeof (double); break;	\
   default:								\
   	printf ("bad argument to REGISTER_U_ADDR %d\n", regno);		\
-	abort ();							\
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");							\
   }									\
 }
diff --git a/gdb/config/z8k/tm-z8k.h b/gdb/config/z8k/tm-z8k.h
index 544dea5936..bd4bac54e6 100644
--- a/gdb/config/z8k/tm-z8k.h
+++ b/gdb/config/z8k/tm-z8k.h
@@ -138,7 +138,7 @@ extern int z8k_saved_pc_after_call (struct frame_info *frame);
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function. */
 
-#define STORE_STRUCT_RETURN(ADDR, SP) abort();
+#define STORE_STRUCT_RETURN(ADDR, SP) internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
 /* Extract from an array REGBUF containing the (raw) register state
    a function return value of type TYPE, and copy that, in virtual format,
@@ -152,7 +152,7 @@ extern int z8k_saved_pc_after_call (struct frame_info *frame);
 /* Write into appropriate registers a function return value
    of type TYPE, given in virtual format. */
 
-#define STORE_RETURN_VALUE(TYPE,VALBUF) abort();
+#define STORE_RETURN_VALUE(TYPE,VALBUF) internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
 /* Extract from an array REGBUF containing the (raw) register state
    the address in which a function should return its structure value,
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 4e1a51895d..a65dbc8cc1 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2202,7 +2202,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name,
 	  case N_ROSYM:
 	    goto case_N_ROSYM;
 	  default:
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  }
       }
 
diff --git a/gdb/exec.c b/gdb/exec.c
index 29da0cc010..639f56f134 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -398,7 +398,7 @@ build_section_table (bfd *some_bfd, struct section_table **start,
   *end = *start;
   bfd_map_over_sections (some_bfd, add_to_section_table, (char *) end);
   if (*end > *start + count)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
   /* We could realloc the table, but it probably loses for most files.  */
   return 0;
 }
@@ -488,7 +488,7 @@ xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
   asection *section;
 
   if (len <= 0)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (overlay_debugging)
     {
diff --git a/gdb/h8500-tdep.c b/gdb/h8500-tdep.c
index aa53d699c1..2f20c157aa 100644
--- a/gdb/h8500-tdep.c
+++ b/gdb/h8500-tdep.c
@@ -251,7 +251,7 @@ h8500_register_size (int regno)
     case PC_REGNUM:
       return 4;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
@@ -286,7 +286,7 @@ h8500_register_virtual_type (int regno)
     case PC_REGNUM:
       return builtin_type_unsigned_long;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
diff --git a/gdb/hpread.c b/gdb/hpread.c
index d87edd6539..2c7cc76c0e 100644
--- a/gdb/hpread.c
+++ b/gdb/hpread.c
@@ -1074,7 +1074,7 @@ static int
 hpread_type_translate (dnttpointer typep)
 {
   if (!typep.dntti.immediate)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   switch (typep.dntti.type)
     {
@@ -1136,7 +1136,7 @@ hpread_type_translate (dnttpointer typep)
     case HP_TYPE_FTN_STRING_VAX_COMPAT:
       return FT_STRING;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
@@ -1501,7 +1501,7 @@ hpread_read_array_type (dnttpointer hp_type, union dnttentry *dn_bufp,
   /* values are not normalized.  */
   if (!((dn_bufp->darray.arrayisbytes && dn_bufp->darray.elemisbytes)
 	|| (!dn_bufp->darray.arrayisbytes && !dn_bufp->darray.elemisbytes)))
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
   else if (dn_bufp->darray.arraylength == 0x7fffffff)
     {
       /* The HP debug format represents char foo[]; as an array with
@@ -1618,7 +1618,7 @@ hpread_type_lookup (dnttpointer hp_type, struct objfile *objfile)
 	if (dn_bufp->dtype.type.dnttp.index < LNTT_SYMCOUNT (objfile))
 	  dn_bufp = hpread_get_lntt (dn_bufp->dtype.type.dnttp.index, objfile);
 	else
-	  abort ();
+	  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
 	if (dn_bufp->dblock.kind == DNTT_TYPE_STRUCT)
 	  prefix = "struct ";
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 7d7a5a844f..fd95baa933 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -947,7 +947,7 @@ gdb_print_insn_i386 (bfd_vma memaddr, disassemble_info *info)
     return print_insn_i386_intel (memaddr, info);
   /* Never reached - disassembly_flavour is always either att_flavor
      or intel_flavor */
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /* If the disassembly mode is intel, we have to also switch the
diff --git a/gdb/i960-tdep.c b/gdb/i960-tdep.c
index 21eb754f17..27fc2062b7 100644
--- a/gdb/i960-tdep.c
+++ b/gdb/i960-tdep.c
@@ -774,7 +774,7 @@ mem (unsigned long memaddr, unsigned long word1, unsigned long word2,
     {
       return len;
     }
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /* Read the i960 instruction at 'memaddr' and return the address of 
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 2517f97e9c..ab94c445e4 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -679,14 +679,14 @@ void
 set_sigio_trap (void)
 {
   if (target_activity_function)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 void
 clear_sigio_trap (void)
 {
   if (target_activity_function)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 #endif /* No SIGIO.  */
 
diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 4841e9c6a0..e4637ee28f 100644
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -272,7 +272,7 @@ child_resume (int pid, int step, enum target_signal signal)
   if (step)
     {
       if (SOFTWARE_SINGLE_STEP_P)
-	abort ();		/* Make sure this doesn't happen. */
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");		/* Make sure this doesn't happen. */
       else
 	ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1,
 		target_signal_to_host (signal));
diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index a6fbc7f664..4ad111a5b9 100644
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -5775,7 +5775,7 @@ _initialize_infttrace (void)
   /* We do a lot of casts from pointers to TTRACE_ARG_TYPE; make sure
      this is okay.  */
   if (sizeof (TTRACE_ARG_TYPE) < sizeof (void *))
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (errno || (memory_page_dictionary.page_size <= 0))
     perror_with_name ("sysconf");
diff --git a/gdb/language.c b/gdb/language.c
index eedec98779..f224b95233 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -571,7 +571,7 @@ binop_result_type (value_ptr v1, value_ptr v2)
     case language_chill:
       error ("Missing Chill support in function binop_result_check.");	/*FIXME */
     }
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
   return (struct type *) 0;	/* For lint */
 }
 
@@ -1384,7 +1384,7 @@ add_language (const struct language_defn *lang)
     {
       fprintf_unfiltered (gdb_stderr, "Magic number of %s language struct wrong\n",
 			  lang->la_name);
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
   if (!languages)
diff --git a/gdb/lynx-nat.c b/gdb/lynx-nat.c
index 20a7e163ee..38bd6d3ddf 100644
--- a/gdb/lynx-nat.c
+++ b/gdb/lynx-nat.c
@@ -410,7 +410,7 @@ store_inferior_registers (int regno)
       if (regno == -1 || regno == SP_REGNUM)
 	{
 	  if (!register_valid[L0_REGNUM + 5])
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  target_write_memory (sp + FRAME_SAVED_I0,
 			      &registers[REGISTER_BYTE (I0_REGNUM)],
 			      8 * REGISTER_RAW_SIZE (I0_REGNUM));
@@ -422,7 +422,7 @@ store_inferior_registers (int regno)
       else if (regno >= L0_REGNUM && regno <= I7_REGNUM)
 	{
 	  if (!register_valid[regno])
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  if (regno >= L0_REGNUM && regno <= L0_REGNUM + 7)
 	    regoffset = REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM)
 	      + FRAME_SAVED_L0;
diff --git a/gdb/m3-nat.c b/gdb/m3-nat.c
index ac11d13ded..cb3cccf301 100644
--- a/gdb/m3-nat.c
+++ b/gdb/m3-nat.c
@@ -346,7 +346,7 @@ port_chain_insert (port_chain_t list, mach_port_t name, int type)
 	}
     }
   else
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   new = (port_chain_t) obstack_alloc (port_chain_obstack,
 				      sizeof (struct port_chain));
@@ -602,17 +602,17 @@ m3_trace_me (void)
   ret = task_get_bootstrap_port (mach_task_self (),
 				 &original_server_port_name);
   if (ret != KERN_SUCCESS)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
   ret = mach_port_deallocate (mach_task_self (),
 			      original_server_port_name);
   if (ret != KERN_SUCCESS)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   /* Suspend this task to let the parent change my ports.
      Resumed by the debugger */
   ret = task_suspend (mach_task_self ());
   if (ret != KERN_SUCCESS)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /*
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 7ed587fb6c..f3d01b59b1 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -2943,7 +2943,7 @@ parse_partial_symbols (struct objfile *objfile)
 	      CORE_ADDR svalue;
 
 	      if (ext_ptr->ifd != f_idx)
-		abort ();
+		internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	      psh = &ext_ptr->asym;
 
 	      /* Do not add undefined symbols to the partial symbol table.  */
diff --git a/gdb/monitor.c b/gdb/monitor.c
index e70283d688..7e3580e1b1 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -335,7 +335,7 @@ monitor_printf_noecho (char *pattern,...)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (monitor_debug_p)
     {
@@ -363,7 +363,7 @@ monitor_printf (char *pattern,...)
 
   len = strlen (sndbuf);
   if (len + 1 > sizeof sndbuf)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (monitor_debug_p)
     {
@@ -1286,7 +1286,7 @@ monitor_dump_regs (void)
       parse_register_dump (buf, resp_len);
     }
   else
-    abort ();			/* Need some way to read registers */
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");			/* Need some way to read registers */
 }
 
 static void
diff --git a/gdb/ocd.c b/gdb/ocd.c
index ec4dc1d9df..240bd672f2 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -880,7 +880,7 @@ stu_put_packet (unsigned char *buf, int len)
   unsigned char c;
 
   if (len == 0 || len > 256)
-    abort ();			/* Can't represent 0 length packet */
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");			/* Can't represent 0 length packet */
 
   reset_packet ();
 
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index c57bf8218a..8c14077e16 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -249,7 +249,7 @@ decode_format (char **string_ptr, int oformat, int osize)
 	  val.size = osize ? 'h' : osize;
 	else
 	  /* Bad value for TARGET_PTR_BIT */
-	  abort ();
+	  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	break;
       case 'f':
 	/* Floating point has to be word or giantword.  */
@@ -456,7 +456,7 @@ print_scalar_formatted (char *valaddr, struct type *type, int format, int size,
       break;
 
     case 0:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
     case 't':
       /* Binary; 't' stands for "two".  */
diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index 42f7540653..e381ae915c 100644
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -226,7 +226,7 @@ bug_open (char *args, int from_tty)
       target_is_m88110 = 1;
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c
index 01840d105c..904ce1f4e5 100644
--- a/gdb/remote-e7000.c
+++ b/gdb/remote-e7000.c
@@ -887,7 +887,7 @@ fetch_regs_from_dump (int (*nextchar) (), char *want)
 		}
 
 	      else
-		abort ();
+		internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	    }
 	  store_signed_integer (buf,
 				REGISTER_RAW_SIZE (regno),
@@ -2117,7 +2117,7 @@ e7000_wait (int pid, struct target_waitstatus *status)
       break;
     default:
       /* Get the user's attention - this should never happen. */
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
   return 0;
diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index 0500a14bb6..764af505ee 100644
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -1031,7 +1031,7 @@ es1800_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
 
   if (len > PBUFSIZ / 2 - 1)
     {
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
   if (len == 1)			/* The emulator does not like expressions like:  */
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 01c6054422..1dd0fcfb39 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -2729,7 +2729,7 @@ common_breakpoint (int set, CORE_ADDR addr, int len, enum break_type type)
 	      flags = "f";
 	      break;
 	    default:
-	      abort ();
+	      internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	    }
 
 	  cmd = 'B';
diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index 0aecc3826e..470a82b027 100644
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -471,13 +471,13 @@ send_rdp (char *template,...)
 	  *pi = get_byte ();
 	  break;
 	default:
-	  abort ();
+	  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	}
     }
   va_end (alist);
 
   if (dst != buf)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 
diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c
index 224032715b..f7c364a21d 100644
--- a/gdb/remote-sds.c
+++ b/gdb/remote-sds.c
@@ -746,7 +746,7 @@ putmessage (unsigned char *buf, int len)
      and giving it a checksum.  */
 
   if (len > 170)		/* Prosanity check */
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (remote_debug)
     {
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 017f31a42f..143b368825 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -59,7 +59,7 @@ fetch_inferior_registers (int regno)
   /* We should never be called with deferred stores, because a prerequisite
      for writing regs is to have fetched them all (PREPARE_TO_STORE), sigh.  */
   if (deferred_stores)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   DO_DEFERRED_STORES;
 
@@ -195,7 +195,7 @@ store_inferior_registers (int regno)
       if (regno < 0 || regno == SP_REGNUM)
 	{
 	  if (!register_valid[L0_REGNUM + 5])
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  target_write_memory (sp,
 			       &registers[REGISTER_BYTE (L0_REGNUM)],
 			       16 * REGISTER_RAW_SIZE (L0_REGNUM));
@@ -203,7 +203,7 @@ store_inferior_registers (int regno)
       else
 	{
 	  if (!register_valid[regno])
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  target_write_memory (sp + REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM),
 			       &registers[REGISTER_BYTE (regno)],
 			       REGISTER_RAW_SIZE (regno));
@@ -214,7 +214,7 @@ store_inferior_registers (int regno)
   if (wanna_store & INT_REGS)
     {
       if (!register_valid[G1_REGNUM])
-	abort ();
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
       memcpy (&inferior_registers.r_g1, &registers[REGISTER_BYTE (G1_REGNUM)],
 	      15 * REGISTER_RAW_SIZE (G1_REGNUM));
@@ -236,7 +236,7 @@ store_inferior_registers (int regno)
   if (wanna_store & FP_REGS)
     {
       if (!register_valid[FP0_REGNUM + 9])
-	abort ();
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");
       memcpy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
 	      sizeof inferior_fp_registers.fpu_fr);
       memcpy (&inferior_fp_registers.Fpu_fsr,
diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index 07b6696ae6..59f710cc88 100644
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -836,7 +836,7 @@ sparclite_download (char *filename, int from_tty)
     download (remote_target_name, filename, from_tty, sparclite_udp_write,
 	      sparclite_udp_start);
 #else
-    abort ();			/* sparclite_open should prevent this! */
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");			/* sparclite_open should prevent this! */
 #endif
   else
     download (remote_target_name, filename, from_tty, sparclite_serial_write,
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 76c2a94e8d..88155b0144 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -998,7 +998,7 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, int global,
 	{
 	  center = bottom + (top - bottom) / 2;
 	  if (!(center < top))
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	  if (!do_linear_search
 	      && (SYMBOL_LANGUAGE (*center) == language_java))
 	    {
@@ -1014,7 +1014,7 @@ lookup_partial_symbol (struct partial_symtab *pst, const char *name, int global,
 	    }
 	}
       if (!(top == bottom))
-	abort ();
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
       /* djb - 2000-06-03 - Use SYMBOL_MATCHES_NAME, not a strcmp, so
 	 we don't have to force a linear search on C++. Probably holds true
diff --git a/gdb/target.c b/gdb/target.c
index 87d392b703..ba4ddc2fce 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -641,7 +641,7 @@ push_target (struct target_ops *t)
       fprintf_unfiltered (gdb_stderr,
 			  "Magic number of %s target struct wrong\n",
 			  t->to_shortname);
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
   /* Find the proper stratum to install this target in. */
@@ -737,7 +737,7 @@ pop_target (void)
   fprintf_unfiltered (gdb_stderr,
 		      "pop_target couldn't find target %s\n",
 		      current_target.to_shortname);
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 #undef	MIN
@@ -2993,5 +2993,5 @@ When non-zero, target debugging is enabled.", &setdebuglist),
   target_dcache = dcache_init();
 
   if (!STREQ (signals[TARGET_SIGNAL_LAST].string, "TARGET_SIGNAL_MAGIC"))
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
diff --git a/gdb/utils.c b/gdb/utils.c
index 0d2595a050..27d9bc7970 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -688,7 +688,7 @@ internal_verror (const char *file, int line,
     case 1:
       dejavu = 2;
       fputs_unfiltered (msg, gdb_stderr);
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     default:
       dejavu = 3;
       write (STDERR_FILENO, msg, sizeof (msg));
@@ -717,13 +717,13 @@ Create a core file containing the current state of GDB? ");
       if (dump_core_p)
 	{
 	  if (fork () == 0)
-	    abort ();
+	    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 	}
     }
   else
     {
       if (dump_core_p)
-	abort ();
+	internal_error (__FILE__, __LINE__, "failed internal consistency check");
       else
 	exit (1);
     }
@@ -955,7 +955,7 @@ static void
 malloc_botch (void)
 {
   fprintf_unfiltered (gdb_stderr, "Memory corruption\n");
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /* Attempt to install hooks in mmalloc/mrealloc/mfree for the heap specified
@@ -1692,7 +1692,7 @@ wrap_here (char *indent)
 {
   /* This should have been allocated, but be paranoid anyway. */
   if (!wrap_buffer)
-    abort ();
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");
 
   if (wrap_buffer[0])
     {
@@ -2802,7 +2802,7 @@ decimal2str (char *paddr_str, char *sign, ULONGEST addr)
 	       sign, temp[2], temp[1], temp[0]);
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 }
 
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 84103c65cb..71c4c9e7ec 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -257,7 +257,7 @@ print_decimal (struct ui_file *stream, char *sign, int use_local,
 			sign, temp[2], temp[1], temp[0]);
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
   return;
 }
@@ -360,7 +360,7 @@ print_longest (struct ui_file *stream, int format, int use_local,
       fprintf_filtered (stream, local_hex_format_custom ("016ll"), val_long);
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 #else /* !CC_HAS_LONG_LONG || !PRINTF_HAS_LONG_LONG */
   /* In the following it is important to coerce (val_long) to a long. It does
@@ -407,7 +407,7 @@ print_longest (struct ui_file *stream, int format, int use_local,
 			(unsigned long) val_long);
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 #endif /* CC_HAS_LONG_LONG || PRINTF_HAS_LONG_LONG */
 }
@@ -467,7 +467,7 @@ strcat_longest (int format, int use_local, LONGEST val_long, char *buf,
       sprintf (buf, local_hex_format_custom ("016ll"), val_long);
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 #else /* !PRINTF_HAS_LONG_LONG */
   /* In the following it is important to coerce (val_long) to a long. It does
@@ -508,7 +508,7 @@ strcat_longest (int format, int use_local, LONGEST val_long, char *buf,
 	       ((long) val_long));
       break;
     default:
-      abort ();
+      internal_error (__FILE__, __LINE__, "failed internal consistency check");
     }
 
 #endif /* !PRINTF_HAS_LONG_LONG */
diff --git a/gdb/w65-tdep.c b/gdb/w65-tdep.c
index 4e6fd2d341..3f76cf5de6 100644
--- a/gdb/w65-tdep.c
+++ b/gdb/w65-tdep.c
@@ -54,13 +54,13 @@ read_memory_pointer (CORE_ADDR x)
 
 init_frame_pc (void)
 {
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 void
 w65_push_dummy_frame (void)
 {
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /* Put here the code to store, into a struct frame_saved_regs,
diff --git a/gdb/xmodem.c b/gdb/xmodem.c
index ad694a5ee0..5a271ec953 100644
--- a/gdb/xmodem.c
+++ b/gdb/xmodem.c
@@ -185,7 +185,7 @@ xmodem_send_packet (serial_t desc, unsigned char *packet, int len, int hashmark)
       datasize = XMODEM_1KDATASIZE;
     }
   else
-    abort ();			/* Packet way too large */
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");			/* Packet way too large */
 
   /* Add ^Z padding if packet < 128 (or 1024) bytes */
 
diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c
index d70c34dfaf..98eb22f92e 100644
--- a/gdb/z8k-tdep.c
+++ b/gdb/z8k-tdep.c
@@ -171,7 +171,7 @@ z8k_frame_chain (struct frame_info *thisframe)
 void
 init_frame_pc (void)
 {
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 /* Put here the code to store, into a struct frame_saved_regs,
@@ -197,7 +197,7 @@ z8k_frame_init_saved_regs (struct frame_info *frame_info)
 void
 z8k_push_dummy_frame (void)
 {
-  abort ();
+  internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
 
 int