diff options
| author | Martin Liska <mliska@suse.cz> | 2018-06-07 06:23:16 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2018-06-07 04:23:16 +0000 |
| commit | 244aebfd6c5195efd123fcd8304b4bc36be7d922 (patch) | |
| tree | 3a78b1b987cadddd3aa81ccff87df8dabfa90578 /libgcc | |
| parent | 6c086e8c75deaedb7db807d8008529747b275275 (diff) | |
| download | gcc-244aebfd6c5195efd123fcd8304b4bc36be7d922.zip gcc-244aebfd6c5195efd123fcd8304b4bc36be7d922.tar.gz gcc-244aebfd6c5195efd123fcd8304b4bc36be7d922.tar.bz2 | |
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
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/libgcov-driver.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 1ff66c5..793b1a3 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,5 +1,10 @@ 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 * libgcov-driver-system.c (replace_filename_variables): Use memcpy instead of mempcpy. diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 7ae33b8..1f2c4a7 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; |