[google gcc-4_8] gcov-tools: minor fix for broken build for arm

Hán Shěn (沈涵) shenhan@google.com
Fri Jan 31 23:41:00 GMT 2014


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



More information about the Gcc-patches mailing list