From: Richard Guenther <rguenther@suse.de>
Date: Fri, 22 Jun 2012 08:16:56 +0000 (+0000)
Subject: re PR gcov-profile/53744 (gcov version oscillates between 407* and 407p on branches)
X-Git-Tag: releases/gcc-4.5.4~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1265fdfda66050e0c18c74ba518cb2afc0944a71;p=thirdparty%2Fgcc.git

re PR gcov-profile/53744 (gcov version oscillates between 407* and 407p on branches)

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

	PR gcov-profile/53744
	* gcov-iov.c (main): Treat "" and "prerelease" the same.

From-SVN: r188879
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce6d65059473..7945ec5ae827 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-22  Richard Guenther  <rguenther@suse.de>
+
+	PR gcov-profile/53744
+	* gcov-iov.c (main): Treat "" and "prerelease" the same.
+
 2012-06-20  Richard Guenther  <rguenther@suse.de>
 
 	Backport from mainline
diff --git a/gcc/gcov-iov.c b/gcc/gcov-iov.c
index de2c32297299..5217f817abd5 100644
--- a/gcc/gcov-iov.c
+++ b/gcc/gcov-iov.c
@@ -48,8 +48,14 @@ main (int argc, char **argv)
   if (*ptr == '.')
     minor = strtoul (ptr + 1, 0, 10);
 
+  /* For releases the development phase is an empty string, for
+     prerelease versions on a release branch it is "prerelease".
+     Consider both equal as patch-level releases do not change
+     the GCOV version either.
+     On the trunk the development phase is "experimental".  */
   phase = argv[2][0];
-  if (phase == '\0')
+  if (phase == '\0'
+      || strcmp (argv[2], "prerelease") == 0)
     phase = '*';
 
   v[0] = (major < 10 ? '0' : 'A' - 10) + major;