Backport r247507

2017-06-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-05-02  Martin Liska  <mliska@suse.cz>

	* doc/gcov.texi: Add missing preposition.
	* gcov.c (function_info::function_info): Properly fill up
	all member variables.

From-SVN: r249533

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd8663a105ba84911548b2a2553d317d9ab65b14..749286afc533894d84430bb72518487982c92b1b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-06-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-05-02  Martin Liska  <mliska@suse.cz>
+
+       * doc/gcov.texi: Add missing preposition.
+       * gcov.c (function_info::function_info): Properly fill up
+       all member variables.
+
 2017-06-22  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi
index 9f9c52ac13781ccc4059168bfac6bdbfb4286781..12586b7e8d06c6010f68f2b7f0b10b3dce66d0fd 100644 (file)
--- a/gcc/doc/gcov.texi
+++ b/gcc/doc/gcov.texi
@@ -324,7 +324,7 @@ containing no code.  Unexecuted lines are marked @samp{#####} or
 @samp{====}, depending on whether they are reachable by
 non-exceptional paths or only exceptional paths such as C++ exception
 handlers, respectively. Given @samp{-a} option, unexecuted blocks are
-marked @samp{$$$$$} or @samp{%%%%%}, depending whether a basic block
+marked @samp{$$$$$} or @samp{%%%%%}, depending on whether a basic block
 is reachable via non-exceptional or exceptional paths.
 
 Some lines of information at the start have @var{line_number} of zero.