[gcov] Fix PR53744

Message ID alpine.LNX.2.00.1206221148500.18010@zhemvz.fhfr.qr
State New
Headers show

Commit Message

Richard Biener June 22, 2012, 9:50 a.m.
On Thu, 21 Jun 2012, Richard Guenther wrote:

> This fixes an annoying thing on release branches - the gcov
> version changes from 407p to 407* at the single revisions that
> are releases and then back to 407p.  That makes it impossible
> to consume profile-feedback data across the revisions on a branch.
> As we do not change the gcov-version with patchlevel increases
> it makes no sense to change it for release vs. prerelease.
> Trunk is marked with experiental and thus is different.
> Tested on x86_64-unknown-linux-gnu, ok for all active branches?

Seems this broke bootstrap on trunk (I've tested on the branch only...).

Dependencies are already setup so that gcov-iov.c depends on
bconfig.h and system.h but it includes system headers directly (sigh).

Thus, the following should fix it, pending this goes into stage3 I'll
install it quickly on trunk.


2012-06-22  Richard Guenther  <rguenther@suse.de>

	* gcov-iov.c: Include bconfig.h and system.h.


Index: gcc/gcov-iov.c
--- gcc/gcov-iov.c	(revision 188876)
+++ gcc/gcov-iov.c	(working copy)
@@ -19,8 +19,8 @@  You should have received a copy of the G
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
-#include <stdio.h>
-#include <stdlib.h>
+#include "bconfig.h"
+#include "system.h"
 /* Command line arguments are the base GCC version and the development
    phase (the latter may be an empty string).  */