* tracepoint.c (merge_uploaded_trace_state_variables): Only print

	messages if info_verbose.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 31a82363cd7ed5d752fb8a2cfac4ebf1e73c56a1..7341c924c3c721a83cf61298332889cc9f15dd02 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * tracepoint.c (merge_uploaded_trace_state_variables): Only print
+       messages if info_verbose.
+
 2010-10-08  Ken Werner  <ken.werner@de.ibm.com>
 
        * valops.c (value_cast): Handle vector types.

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index b8b9d8cef5c84540c2bbf4ae8e893e1aa1cefdff..b441bd49ffd4edc29e5a292b3f1e0107e159f1e5 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3139,13 +3139,17 @@ merge_uploaded_trace_state_variables (struct uploaded_tsv **uploaded_tsvs)
     {
       tsv = find_matching_tsv (utsv);
       if (tsv)
-       printf_filtered (_("Assuming trace state variable $%s is same as target's variable %d.\n"),
-                        tsv->name, utsv->number);
+       {
+         if (info_verbose)
+           printf_filtered (_("Assuming trace state variable $%s is same as target's variable %d.\n"),
+                            tsv->name, utsv->number);
+       }
       else
        {
          tsv = create_tsv_from_upload (utsv);
-         printf_filtered (_("Created trace state variable $%s for target's variable %d.\n"),
-                          tsv->name, utsv->number);
+         if (info_verbose)
+           printf_filtered (_("Created trace state variable $%s for target's variable %d.\n"),
+                            tsv->name, utsv->number);
        }
       /* Give precedence to numberings that come from the target.  */
       if (tsv)