aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgcc/ChangeLog4
-rw-r--r--libgcc/libgcov-merge.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5448567..329e75b 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-11 Jakub Jelinek <jakub@redhat.com>
+
+ * libgcov-merge.c (__gcov_merge_single): Revert previous change.
+
2019-06-10 Martin Liska <mliska@suse.cz>
PR bootstrap/90808
diff --git a/libgcc/libgcov-merge.c b/libgcc/libgcov-merge.c
index 4241634..f778cc4 100644
--- a/libgcc/libgcov-merge.c
+++ b/libgcc/libgcov-merge.c
@@ -34,9 +34,8 @@ void __gcov_merge_add (gcov_type *counters __attribute__ ((unused)),
#endif
#ifdef L_gcov_merge_single
-void __gcov_merge_single (gcov_type *counters __attribute__ ((unused)))
-{
-}
+void __gcov_merge_single (gcov_type *counters __attribute__ ((unused)),
+ unsigned n_counters __attribute__ ((unused))) {}
#endif
#else