* libgcov-merge.c (__gcov_merge_single): Revert previous change.

From-SVN: r272143

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5448567487ccd17a111bfa9a54ad5964b959dae1..329e75b5b05a96a1129c51ebf80ba760608b5a76 100644 (file)
--- 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 42416341b4d971fd60015673c1f9556765e4590f..f778cc4b6b7383da49ed5c2cd12bbb6994207a77 100644 (file)
--- 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