diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5113ecafcd6..217295e38bb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i387-tdep.c (i387_collect_xsave): Replace abort with
+	internal_error.
+
 2010-04-08  Stan Shebs  <stan@codesourcery.com>
 
 	* breakpoint.c (default_collect_info): New function.
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index eac32161181..6dc9c2c5f60 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -1033,7 +1033,8 @@ i387_collect_xsave (const struct regcache *regcache, int regnum,
 	  switch (regclass)
 	    {
 	    default:
-	      abort ();
+	      internal_error (__FILE__, __LINE__,
+			      _("invalid i387 regclass"));
 
 	    case avxh:
 	      /* This is an upper YMM register.  */
@@ -1077,7 +1078,8 @@ i387_collect_xsave (const struct regcache *regcache, int regnum,
 	  switch (regclass)
 	    {
 	    default:
-	      abort ();
+	      internal_error (__FILE__, __LINE__,
+			      _("invalid i387 regclass"));
 
 	    case all:
 	      break;