Fix few -Wformat-diag warnings.

Ready for master?

Thanks,
Martin

gcc/ChangeLog:

	* cgraphunit.c (process_symver_attribute): Wrap weakref keyword.
	* dbgcnt.c (dbg_cnt_set_limit_by_index): Do not print extra new
	line.
	* lto-wrapper.c (merge_and_complain): Wrap option names.

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 01b3f82..ea9a34b 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -762,7 +762,7 @@ process_symver_attribute (symtab_node *n)
   if (n->weakref)
     {
       error_at (DECL_SOURCE_LOCATION (n->decl),
-               "weakref cannot be versioned");
+               "%<weakref%> cannot be versioned");
       return;
     }
   if (!TREE_PUBLIC (n->decl))

diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index b0dd893..ae98a28 100644 (file)
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -126,7 +126,7 @@ dbg_cnt_set_limit_by_index (enum debug_counter index, const char *name,
       if (t1.first <= t2.second)
        {
          error ("Interval overlap of %<-fdbg-cnt=%s%>: [%u, %u] and "
-                "[%u, %u]\n", name, t2.first, t2.second, t1.first, t1.second);
+                "[%u, %u]", name, t2.first, t2.second, t1.first, t1.second);
          return false;
        }
     }

diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c
index d565b08..8fbca7c 100644 (file)
--- a/gcc/lto-wrapper.c
+++ b/gcc/lto-wrapper.c
@@ -508,24 +508,24 @@ merge_and_complain (struct cl_decoded_option **decoded_options,
          break;
        else if (i < *decoded_options_count && j == fdecoded_options_count)
          {
-           warning (0, "Extra option to -Xassembler: %s,"
-                    " dropping all -Xassembler and -Wa options.",
+           warning (0, "Extra option to %<-Xassembler%>: %s,"
+                    " dropping all %<-Xassembler%> and %<-Wa%> options.",
                     (*decoded_options)[i].arg);
            xassembler_options_error = true;
            break;
          }
        else if (i == *decoded_options_count && j < fdecoded_options_count)
          {
-           warning (0, "Extra option to -Xassembler: %s,"
-                    " dropping all -Xassembler and -Wa options.",
+           warning (0, "Extra option to %<-Xassembler%>: %s,"
+                    " dropping all %<-Xassembler%> and %<-Wa%> options.",
                     fdecoded_options[j].arg);
            xassembler_options_error = true;
            break;
          }
        else if (strcmp ((*decoded_options)[i].arg, fdecoded_options[j].arg))
          {
-           warning (0, "Options to Xassembler do not match: %s, %s,"
-                    " dropping all -Xassembler and -Wa options.",
+           warning (0, "Options to %<-Xassembler%> do not match: %s, %s,"
+                    " dropping all %<-Xassembler%> and %<-Wa%> options.",
                     (*decoded_options)[i].arg, fdecoded_options[j].arg);
            xassembler_options_error = true;
            break;