Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / diagnostic.c

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 42a40c6..28217a7 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -48,11 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 /* Prototypes.  */
 static char *build_message_string (const char *, ...) ATTRIBUTE_PRINTF_1;
 
-static void default_diagnostic_starter (diagnostic_context *,
-                                       diagnostic_info *);
-static void default_diagnostic_finalizer (diagnostic_context *,
-                                         diagnostic_info *);
-
 static void error_recursion (diagnostic_context *) ATTRIBUTE_NORETURN;
 
 static void diagnostic_action_after_output (diagnostic_context *,
@@ -162,7 +157,7 @@ diagnostic_build_prefix (diagnostic_info *diagnostic)
   return
     (s.file == NULL
      ? build_message_string ("%s: %s", progname, text)
-     : flag_show_column && s.column != 0
+     : flag_show_column
      ? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text)
      : build_message_string ("%s:%d: %s", s.file, s.line, text));
 }
@@ -244,9 +239,15 @@ diagnostic_report_current_module (diagnostic_context *context)
       if (! MAIN_FILE_P (map))
        {
          map = INCLUDED_FROM (line_table, map);
-         pp_verbatim (context->printer,
-                      "In file included from %s:%d",
-                      map->to_file, LAST_SOURCE_LINE (map));
+         if (flag_show_column)
+           pp_verbatim (context->printer,
+                        "In file included from %s:%d:%d",
+                        map->to_file,
+                        LAST_SOURCE_LINE (map), LAST_SOURCE_COLUMN (map));
+         else
+           pp_verbatim (context->printer,
+                        "In file included from %s:%d",
+                        map->to_file, LAST_SOURCE_LINE (map));
          while (! MAIN_FILE_P (map))
            {
              map = INCLUDED_FROM (line_table, map);
@@ -260,7 +261,7 @@ diagnostic_report_current_module (diagnostic_context *context)
     }
 }
 
-static void
+void
 default_diagnostic_starter (diagnostic_context *context,
                            diagnostic_info *diagnostic)
 {
@@ -268,7 +269,7 @@ default_diagnostic_starter (diagnostic_context *context,
   pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic));
 }
 
-static void
+void
 default_diagnostic_finalizer (diagnostic_context *context,
                              diagnostic_info *diagnostic ATTRIBUTE_UNUSED)
 {
@@ -299,7 +300,7 @@ diagnostic_classify_diagnostic (diagnostic_context *context,
    DC.  This function is *the* subroutine in terms of which front-ends
    should implement their specific diagnostic handling modules.  The
    front-end independent format specifiers are exactly those described
-   in the documentation of output_format.  
+   in the documentation of output_format.
    Return true if a diagnostic was printed, false otherwise.  */
 
 bool
@@ -316,9 +317,12 @@ diagnostic_report_diagnostic (diagnostic_context *context,
       && !diagnostic_report_warnings_p (location))
     return false;
 
-  if (diagnostic->kind == DK_PEDWARN) 
+  if (diagnostic->kind == DK_NOTE && flag_compare_debug)
+    return false;
+
+  if (diagnostic->kind == DK_PEDWARN)
     diagnostic->kind = pedantic_warning_kind ();
-  
+
   if (context->lock > 0)
     {
       /* If we're reporting an ICE in the middle of some other error,
@@ -340,7 +344,7 @@ diagnostic_report_diagnostic (diagnostic_context *context,
       diagnostic->kind = DK_ERROR;
       maybe_print_warnings_as_errors_message = true;
     }
-  
+
   if (diagnostic->option_index)
     {
       /* This tests if the user provided the appropriate -Wfoo or
@@ -380,7 +384,7 @@ diagnostic_report_diagnostic (diagnostic_context *context,
       dump_active_plugins (stderr);
     }
 
-  if (diagnostic->kind == DK_ICE) 
+  if (diagnostic->kind == DK_ICE)
     {
 #ifndef ENABLE_CHECKING
       /* When not checking, ICEs are converted to fatal errors when an
@@ -401,13 +405,13 @@ diagnostic_report_diagnostic (diagnostic_context *context,
                                    diagnostic->message.args_ptr);
     }
   ++diagnostic_kind_count (context, diagnostic->kind);
-  
+
   saved_format_spec = diagnostic->message.format_spec;
   if (context->show_option_requested && diagnostic->option_index)
     diagnostic->message.format_spec
       = ACONCAT ((diagnostic->message.format_spec,
                   " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
-  
+
   diagnostic->message.locus = &diagnostic->location;
   diagnostic->message.abstract_origin = &diagnostic->abstract_origin;
   diagnostic->abstract_origin = NULL;
@@ -478,7 +482,7 @@ verbatim (const char *gmsgid, ...)
 }
 
 bool
-emit_diagnostic (diagnostic_t kind, location_t location, int opt, 
+emit_diagnostic (diagnostic_t kind, location_t location, int opt,
                 const char *gmsgid, ...)
 {
   diagnostic_info diagnostic;
@@ -516,7 +520,7 @@ inform (location_t location, const char *gmsgid, ...)
 }
 
 /* A warning at INPUT_LOCATION.  Use this for code which is correct according
-   to the relevant language specification but is likely to be buggy anyway.  
+   to the relevant language specification but is likely to be buggy anyway.
    Returns true if the warning was printed, false if it was inhibited.  */
 bool
 warning (int opt, const char *gmsgid, ...)