Index: gdb/breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.321
diff -u -p -r1.321 breakpoint.c
--- gdb/breakpoint.c	4 May 2008 19:38:59 -0000	1.321
+++ gdb/breakpoint.c	27 May 2008 18:00:37 -0000
@@ -6495,14 +6495,34 @@ catch_unload_command_1 (char *arg, int t
 static enum print_stop_action
 print_exception_catchpoint (struct breakpoint *b)
 {
+  int bp_temp;
+  char msg[160];
+  const char * msgspec;
+  const char msgfmt[] = "\n%s %d (exception %s)\n";
+
   annotate_catchpoint (b->number);
 
   if (strstr (b->addr_string, "throw") != NULL)
-    printf_filtered (_("\nCatchpoint %d (exception thrown)\n"),
-		     b->number);
+    msgspec = "thrown";
   else
-    printf_filtered (_("\nCatchpoint %d (exception caught)\n"),
-		     b->number);
+    msgspec = "caught";
+  if (b->loc->address != b->loc->requested_address)
+    breakpoint_adjustment_warning (b->loc->requested_address,
+	                           b->loc->address,
+				   b->number, 1);
+  bp_temp = b->loc->owner->disposition == disp_del;
+  sprintf (msg, msgfmt, 
+	   bp_temp ? "Temporary catchpoint" : "Catchpoint", 
+	   b->number, msgspec);
+  ui_out_text (uiout, msg);
+  if (ui_out_is_mi_like_p (uiout))
+    {
+      ui_out_field_string (uiout, "reason", 
+			   async_reason_lookup (EXEC_ASYNC_BREAKPOINT_HIT));
+      ui_out_field_string (uiout, "disp", bpdisp_text (b->disposition));
+    }
+  ui_out_field_int (uiout, "bkptno", b->number);
+  ui_out_text (uiout, ", ");
 
   return PRINT_SRC_AND_LOC;
 }