Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2018-08-20 15:46:45 -0400
committerRoland Grunberg2018-08-21 13:30:24 -0400
commite9b3909276ff8f887f70460dfa9058b0f579b2f7 (patch)
tree3734bfd65e77134853b469e6a2e4b05264d31856
parentba67f1ad12da4463a57d0c7f330f204354e78e1e (diff)
downloadorg.eclipse.linuxtools-e9b3909276ff8f887f70460dfa9058b0f579b2f7.tar.gz
org.eclipse.linuxtools-e9b3909276ff8f887f70460dfa9058b0f579b2f7.tar.xz
org.eclipse.linuxtools-e9b3909276ff8f887f70460dfa9058b0f579b2f7.zip
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> (cherry picked from commit bde40588d98aaea7407173a507aba9a800cdc5cd) Reviewed-on: https://git.eclipse.org/r/127790
-rw-r--r--gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java10
1 files changed, 5 insertions, 5 deletions
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 f137bfdb09..8a09115ab9 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 @@ public class GcnoRecordsParser {
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 @@ public class GcnoRecordsParser {
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 @@ public class GcnoRecordsParser {
}
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;

Back to the top