summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-06-11 09:54:17 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2019-06-11 09:54:17 +0200
commit0d7b3e477bd705a9ff301dccd6abb729918a4551 (patch)
tree016da2aae0566cebda410a1ba2a117560c3681ed
parentc36d06eb923512dfee8690612c6994684ba01dd1 (diff)
* libgcov-merge.c (__gcov_merge_single): Revert previous change.
From-SVN: r272143
-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 5448567487c..329e75b5b05 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 42416341b4d..f778cc4b6b7 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