From: Martin Liska <mliska@suse.cz>
Date: Thu, 7 Jun 2018 04:23:16 +0000 (+0200)
Subject: Fix compilation of libgcov with GCOV_LOCKED=0.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=244aebfd6c5195efd123fcd8304b4bc36be7d922;p=gcc.git

Fix compilation of libgcov with GCOV_LOCKED=0.

2018-06-07  Martin Liska  <mliska@suse.cz>

	* libgcov-driver.c: Rename cs_all to all and assign it from
        all_prg.

From-SVN: r261261
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 1ff66c54dad..793b1a3e487 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-07  Martin Liska  <mliska@suse.cz>
+
+	* libgcov-driver.c: Rename cs_all to all and assign it from
+        all_prg.
+
 2018-06-07  Martin Liska  <mliska@suse.cz>
 
         PR bootstrap/86057
diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c
index 7ae33b8d417..1f2c4a74298 100644
--- a/libgcc/libgcov-driver.c
+++ b/libgcc/libgcov-driver.c
@@ -573,7 +573,7 @@ merge_summary (const char *filename __attribute__ ((unused)), int run_counted,
 {
 #if !GCOV_LOCKED 
   /* summary for all instances of program.  */ 
-  struct gcov_summary *cs_all;
+  struct gcov_summary *all;
 #endif 
 
   /* Merge the summary.  */
@@ -593,7 +593,7 @@ merge_summary (const char *filename __attribute__ ((unused)), int run_counted,
   else
     gcov_histogram_merge (prg->histogram, this_prg->histogram);
 #if !GCOV_LOCKED
-  all = &all_prg->ctrs[t_ix];
+  all = all_prg;
   if (!all->runs && prg->runs)
     {
       all->num = prg->num;