aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2018-01-04 09:55:15 +0100
committerMartin Liska <marxin@gcc.gnu.org>2018-01-04 08:55:15 +0000
commit6f3102fdbbfd0596c6f86a953a0e0a955ade4540 (patch)
treea36909b9a927d8878370a52ddd6b89a0cb106004 /gcc
parentfcb6fced16389962ebf2cebe737d534994a80fb6 (diff)
downloadgcc-6f3102fdbbfd0596c6f86a953a0e0a955ade4540.zip
gcc-6f3102fdbbfd0596c6f86a953a0e0a955ade4540.tar.gz
gcc-6f3102fdbbfd0596c6f86a953a0e0a955ade4540.tar.bz2
Add version to intermediate gcov file (PR gcov-profile/83669).
2018-01-04 Martin Liska <mliska@suse.cz> PR gcov-profile/83669 * gcov.c (output_intermediate_file): Add version to intermediate gcov file. * doc/gcov.texi: Document new field 'version' in intermediate file format. Fix location of '-k' option of gcov command. From-SVN: r256227
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/doc/gcov.texi10
-rw-r--r--gcc/gcov.c1
3 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 007e2d5..71ac19d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
2018-01-04 Martin Liska <mliska@suse.cz>
+ PR gcov-profile/83669
+ * gcov.c (output_intermediate_file): Add version to intermediate
+ gcov file.
+ * doc/gcov.texi: Document new field 'version' in intermediate
+ file format. Fix location of '-k' option of gcov command.
+
+2018-01-04 Martin Liska <mliska@suse.cz>
+
PR ipa/82352
* ipa-icf.c (sem_function::merge): Do not cross comdat boundary.
diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi
index f37aa3e..b55ee852 100644
--- a/gcc/doc/gcov.texi
+++ b/gcc/doc/gcov.texi
@@ -187,11 +187,8 @@ be used by @command{lcov} or other tools. The output is a single
The format of the intermediate @file{.gcov} file is plain text with
one entry per line
-@item -j
-@itemx --human-readable
-Write counts in human readable format (like 24k).
-
@smallexample
+version:@var{gcc_version}
file:@var{source_file_name}
function:@var{start_line_number},@var{end_line_number},@var{execution_count},@var{function_name}
lcount:@var{line number},@var{execution_count},@var{has_unexecuted_block}
@@ -212,6 +209,7 @@ times.
Here is a sample when @option{-i} is used in conjunction with @option{-b} option:
@smallexample
+version: 8.1.0 20180103
file:tmp.cpp
function:7,7,0,_ZN3FooIcEC2Ev
function:7,7,1,_ZN3FooIiEC2Ev
@@ -252,6 +250,10 @@ branch:35,nottaken
lcount:36,1,0
@end smallexample
+@item -j
+@itemx --human-readable
+Write counts in human readable format (like 24k).
+
@item -k
@itemx --use-colors
diff --git a/gcc/gcov.c b/gcc/gcov.c
index 3b80f51..37f431c 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1035,6 +1035,7 @@ file 'foo.cc.gcov' similar to the above example. */
static void
output_intermediate_file (FILE *gcov_file, source_info *src)
{
+ fprintf (gcov_file, "version:%s\n", version_string);
fprintf (gcov_file, "file:%s\n", src->name); /* source file name */
std::sort (src->functions.begin (), src->functions.end (),