commit bde40588d98aaea7407173a507aba9a800cdc5cd
author Roland Grunberg <rgrunber@redhat.com> Mon Aug 20 15:46:45 2018 -0400
committer Roland Grunberg <rgrunber@redhat.com> Mon Aug 20 16:24:45 2018 -0400
tree a409dc06077b7aba7a1fccdb41c1bac0699a2eda
parent a0b63daa3e6eb807c45bc31297b69f0ad86a5d3c

Bug 535611 - Adjust 8.1.0 version string to include compatible releases.

Change-Id: If7d198d673a5c7c7da8bc42c6f39939ccc859540
Reviewed-on: https://git.eclipse.org/r/127727
Tested-by: CI Bot
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>

gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java

diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
index f137bfd..8a09115 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
@@ -37,7 +37,7 @@
     private static final int GCOV_TAG_ARCS = 0x01430000;
     private static final int GCOV_TAG_LINES = 0x01450000;
 
-    private static final int GCC_VER_810R = 1094201682; // GCC 8.1.0 Release
+    private static final int GCC_VER_810 = 1094201642; // GCC 8.1.0 ('A81*')
     private static final int GCC_VER_407 = 875575082; // GCC 4.0.7
 
     private GcnoFunction fnctn = null;
@@ -125,13 +125,13 @@
                         stream.readInt();
                     }
                     String fnctnName = GcovStringReader.readString(stream);
-                    if (version >= GCC_VER_810R) {
+                    if (version >= GCC_VER_810) {
                         // long artificial = (stream.readInt() & MasksGenerator.UNSIGNED_INT_MASK);
                         stream.readInt();
                     }
                     String fnctnSrcFle = GcovStringReader.readString(stream);
                     long fnctnFrstLnNmbr = (stream.readInt() & MasksGenerator.UNSIGNED_INT_MASK);
-                    if (version >= GCC_VER_810R) {
+                    if (version >= GCC_VER_810) {
                         // long fnctnFrstColumnLnNmbr = (stream.readInt() & MasksGenerator.UNSIGNED_INT_MASK);
                         stream.readInt();
                         // long fnctnLastLnNmbr = (stream.readInt() & MasksGenerator.UNSIGNED_INT_MASK);
@@ -149,13 +149,13 @@
                 }
 
                 else if (tag == GCOV_TAG_BLOCKS) {
-                    if (version >= GCC_VER_810R) {
+                    if (version >= GCC_VER_810) {
                         length = stream.readInt();
                     }
                     blocks = new ArrayList<>();
                     Block blck;
                     for (int i = 0; i < length; i++) {
-                        if (version >= GCC_VER_810R) {
+                        if (version >= GCC_VER_810) {
                             blck = new Block(0); // value not used anywhere
                         } else {
                             long BlckFlag = stream.readInt() & MasksGenerator.UNSIGNED_INT_MASK;