re PR target/65697 (__atomic memory barriers not strong enough for __sync builtins)

[gcc.git] / gcc / gcov.c

diff --git a/gcc/gcov.c b/gcc/gcov.c
index 6aa48fd26c23a5e0342d0f36f421ea71f537ba19..60a9d4af1176b5b79414b2986c15dbfe4837539d 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1,6 +1,6 @@
 /* Gcov.c: prepend line execution counts and branch probabilities to a
    source file.
-   Copyright (C) 1990-2013 Free Software Foundation, Inc.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.
    Contributed by James E. Wilson of Cygnus Support.
    Mangled by Bob Manson of Cygnus Support.
    Mangled further by Nathan Sidwell <nathan@codesourcery.com>
@@ -398,7 +398,7 @@ static void executed_summary (unsigned, unsigned);
 static void function_summary (const coverage_t *, const char *);
 static const char *format_gcov (gcov_type, gcov_type, int);
 static void accumulate_line_counts (source_t *);
-static void output_gcov_file(const char *, source_t *);
+static void output_gcov_file (const char *, source_t *);
 static int output_branch_count (FILE *, int, const arc_t *);
 static void output_lines (FILE *, const source_t *);
 static char *make_gcov_file_name (const char *, const char *);
@@ -448,8 +448,8 @@ main (int argc, char **argv)
   for (; argno != argc; argno++)
     {
       if (flag_display_progress)
-        printf("Processing file %d out of %d\n",  
-               argno - first_arg + 1, argc - first_arg);
+        printf ("Processing file %d out of %d\n",
+               argno - first_arg + 1, argc - first_arg);
       process_file (argv[argno]);
     }
 
@@ -500,7 +500,7 @@ static void
 print_version (void)
 {
   fnotice (stdout, "gcov %s%s\n", pkgversion_string, version_string);
-  fprintf (stdout, "Copyright %s 2013 Free Software Foundation, Inc.\n",
+  fprintf (stdout, "Copyright %s 2015 Free Software Foundation, Inc.\n",
           _("(C)"));
   fnotice (stdout,
           _("This is free software; see the source for copying conditions.\n"
@@ -621,7 +621,7 @@ get_gcov_intermediate_filename (const char *file_name)
   /* Find the 'basename'.  */
   cptr = lbasename (file_name);
 
-  result = XNEWVEC(char, strlen (cptr) + strlen (gcov) + 1);
+  result = XNEWVEC (char, strlen (cptr) + strlen (gcov) + 1);
   sprintf (result, "%s%s", cptr, gcov);
 
   return result;
@@ -699,7 +699,7 @@ output_intermediate_file (FILE *gcov_file, source_t *src)
                   branch_type = (arc->count > 0) ? "taken" : "nottaken";
                 else
                   branch_type = "notexec";
-                fprintf(gcov_file, "branch:%d,%s\n", line_num, branch_type);
+                fprintf (gcov_file, "branch:%d,%s\n", line_num, branch_type);
               }
           }
     }
@@ -782,7 +782,7 @@ process_file (const char *file_name)
 }
 
 static void
-output_gcov_file(const char *file_name, source_t *src)
+output_gcov_file (const char *file_name, source_t *src)
 {
   char *gcov_file_name = make_gcov_file_name (file_name, src->coverage.name);
 
@@ -1141,7 +1141,7 @@ find_source (const char *file_name)
       if (!info_emitted)
        {
          fnotice (stderr,
-                  "(the message is only displayed one per source file)\n");
+                  "(the message is displayed only once per source file)\n");
          info_emitted = 1;
        }
       sources[idx].file_time = 0;
@@ -1846,7 +1846,7 @@ format_gcov (gcov_type top, gcov_type bottom, int dp)
        }
     }
   else
-    sprintf (buffer, HOST_WIDEST_INT_PRINT_DEC, (HOST_WIDEST_INT)top);
+    sprintf (buffer, "%" PRId64, (int64_t)top);
 
   return buffer;
 }