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: r249520

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f3606eef70958e98eb8213c0012588152e80707..11a5ddfc4dd424899818c59350823cc69be6d965 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 d38f63370c2e076f0fcb88b485c057bdfbbe2f42..6d6a10bff115edde895dc49dc9c2f98aac88283a 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.