commit d9cc6813eccfc2afa35be6b201a222a44c657b55
Author: Dmitry Kozlov <dmitry_kozlov@mentor.com>
Date:   Wed Oct 10 14:56:52 2012 +0400

    Modify trace-status output to always output stop-notes.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9196bc2..f34f04e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,8 +1,19 @@
+2012-10-10  Dmitry Kozlov  <ddk@codesourcery.com>
+
+	* tracepoint.c (trace_status_mi):  Modify trace status MI command output to 
+	always output stop-notes.
+	(trace_save): Save stop-notes if any by tsave.
+	(parse_trace_status): Add parsing stop-notes.
+
 2012-10-04  Dmitry Kozlov  <ddk@codesourcery.com>
 
 	* tracepoint.c (trace_save): Add saving starttime, stoptime, user and notes.
 
-2012-10-04  Dmitry Kozlov  <ddk@mentor.com>
+2012-10-04  Dmitry Kozlov  <ddk@codesourcery.com>
+
+	* tracepoint.c (trace_save): Add saving starttime, stoptime, user and notes.
+
+2012-10-04  Dmitry Kozlov  <ddk@codesourcery.com>
 
 	* tracepoint.c (trace_status_command): Fix type of printf arg.
 	(trace_status_mi): Likewise.
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 8bfbe9c..a23bb6d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-11 Dmitry Kozlov <ddk@codesourcery.com>
+
+	* gdbserver/tracepoint.c (cmd_qtstatus): Modify trace-status output to
+	always output stop-notes.
+
 2012-10-01  Andrew Burgess  <aburgess@broadcom.com>
 
 	* server.c (handle_search_memory_1): Include access length in
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 201a25b..60ba775 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -3657,7 +3657,7 @@ cmd_qtstatus (char *packet)
 	   "circular:%d;"
 	   "disconn:%d;"
 	   "starttime:%s;stoptime:%s;"
-	   "username:%s:;notes:%s:",
+	   "username:%s;notes:%s;stop-notes:%s",
 	   tracing ? 1 : 0,
 	   stop_reason_rsp, tracing_stop_tpnum,
 	   traceframe_count, traceframes_created,
@@ -3665,7 +3665,7 @@ cmd_qtstatus (char *packet)
 	   circular_trace_buffer,
 	   disconnected_tracing,
 	   plongest (tracing_start_time), plongest (tracing_stop_time),
-	   buf1, buf2);
+	   buf1, buf2, buf3);
 }
 
 static void
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 959ede5..507ca41 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2164,6 +2164,8 @@ trace_status_mi (int on_stop)
 
   ui_out_field_string (uiout, "user-name", ts->user_name);
   ui_out_field_string (uiout, "notes", ts->notes);
+  // Always output stop-notes to MI to unify IDE processing of start and stop notes
+  ui_out_field_string (uiout, "stop-notes", ts->stop_desc);
 
   {
     char buf[100];
@@ -3065,6 +3067,14 @@ trace_save (const char *filename, int target_does_save)
 	  fprintf (fp, ";username:%s", buf);
 	  xfree (buf);
     }
+  if (ts->stop_desc)
+    {
+	  char *buf = (char *) xmalloc (strlen (ts->stop_desc) * 2 + 1);
+
+	  bin2hex ((gdb_byte *) ts->stop_desc, buf, 0);
+	  fprintf (fp, ";stop-notes:%s", buf);
+	  xfree (buf);
+    }
 
   fprintf (fp, "\n");
 
@@ -3994,6 +4004,14 @@ Status line: '%s'\n"), p, line);
 	  ts->notes[end] = '\0';
 	  p = p3;
 	}
+      else if (strncmp (p, "stop-notes", p1 - p) == 0)
+	{
+	  ++p1;
+	  ts->stop_desc = xmalloc (strlen (p) / 2);
+	  end = hex2bin (p1, ts->stop_desc, (p3 - p1) / 2);
+	  ts->stop_desc[end] = '\0';
+	  p = p3;
+	}
       else
 	{
 	  /* Silently skip unknown optional info.  */