diff options
| author | Richard Guenther <rguenther@suse.de> | 2012-06-22 08:07:47 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2012-06-22 08:07:47 +0000 |
| commit | e196f4b796bd08c891f245f425434709328541b9 (patch) | |
| tree | 09ce577aa686cd06f16f0241cd3f8364eb06ae13 /gcc | |
| parent | 1a102c521eb5fee14b77adabaf2fd1c0cb6e649c (diff) | |
| download | gcc-e196f4b796bd08c891f245f425434709328541b9.zip gcc-e196f4b796bd08c891f245f425434709328541b9.tar.gz gcc-e196f4b796bd08c891f245f425434709328541b9.tar.bz2 | |
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: r188876
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/gcov-iov.c | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ce83b6..ddf170c 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-22 Eric Botcazou <ebotcazou@adacore.com> PR debug/53704 diff --git a/gcc/gcov-iov.c b/gcc/gcov-iov.c index 9a73cd5..bd062e7 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; |