diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a538f1a74a..3064089060 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-03  Pierre Muller <muller@ics.u-strasbg.fr>
+	    Richard Earnshaw <rearnsha@arm.com>
+
+	* arm-tdep.c (displaced_write_reg): Replace call to abort by call
+	to internal_error.
+
 2009-09-02  Tom Tromey  <tromey@redhat.com>
 
 	* frame.h (frame_unwinder_is): Declare.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a2523f5ff3..6e98469e51 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2769,7 +2769,8 @@ displaced_write_reg (struct regcache *regs, struct displaced_step_closure *dsc,
 	  break;
 
 	default:
-	  abort ();
+	  internal_error (__FILE__, __LINE__,
+			  _("Invalid argument to displaced_write_reg"));
 	}
 
       dsc->wrote_to_pc = 1;