aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/libgcov-util.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 49186fa..0853765 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-15 Gilles Gouaillardet <gilles.gouaillardet@gmail.com>
+
+ PR gcov-profile/67097
+ * libgcov-util.c (gcov_profile_merge): Skip missing files.
+
2016-08-10 Martin Liska <mliska@suse.cz>
PR gcov-profile/58306
diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c
index c8fb52d..24ee50e 100644
--- a/libgcc/libgcov-util.c
+++ b/libgcc/libgcov-util.c
@@ -673,6 +673,7 @@ gcov_profile_merge (struct gcov_info *tgt_profile, struct gcov_info *src_profile
{
gi_ptr = in_src_not_tgt[i];
gcov_merge (gi_ptr, gi_ptr, w2 - 1);
+ gi_ptr->next = NULL;
tgt_tail->next = gi_ptr;
tgt_tail = gi_ptr;
}