| Message ID | CACkGtribeTxs4dQbNU8V+cbaBXtqUqE4swPrx9=WvCJuNP04+A@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
Thanks for catching this, and the fix. OK for google branch. -Rong On Fri, Jan 31, 2014 at 2:46 PM, Hán Shěn (沈涵) <shenhan@google.com> wrote: > Hi Rong, while building for arm toolchain on chromeos, GCOV_LOCKED is > not defined, which leads to redefinition of cs_all, this is observed > on google/gcc-4_8 branch. > > Patch below, tested on chromeos for arm and x86_64 arch. > > Ok for google/gcc-4_8 branch? > > diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c > index 76f6104..bbce3a6 100644 > --- a/libgcc/libgcov-driver.c > +++ b/libgcc/libgcov-driver.c > @@ -559,10 +559,6 @@ gcov_exit_merge_summary (const struct gcov_info > *gi_ptr, struct gcov_summary *pr > { > struct gcov_ctr_summary *cs_prg, *cs_tprg, *cs_all; > unsigned t_ix; > -#if !GCOV_LOCKED > - /* summary for all instances of program. */ > - struct gcov_ctr_summary *cs_all; > -#endif > > /* Merge the summaries. */ > for (t_ix = 0; t_ix < GCOV_COUNTERS_SUMMABLE; t_ix++) > > > Han
diff --git a/libgcc/libgcov-driver.c b/libgcc/libgcov-driver.c index 76f6104..bbce3a6 100644 --- a/libgcc/libgcov-driver.c +++ b/libgcc/libgcov-driver.c @@ -559,10 +559,6 @@ gcov_exit_merge_summary (const struct gcov_info *gi_ptr, struct gcov_summary *pr { struct gcov_ctr_summary *cs_prg, *cs_tprg, *cs_all; unsigned t_ix; -#if !GCOV_LOCKED - /* summary for all instances of program. */ - struct gcov_ctr_summary *cs_all; -#endif /* Merge the summaries. */