diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/array-notation-common.c | 30 | ||||
| -rw-r--r-- | gcc/gcc-ar.c | 2 | ||||
| -rw-r--r-- | gcc/gcov-io.c | 12 | ||||
| -rw-r--r-- | gcc/hsa-dump.c | 8 | ||||
| -rw-r--r-- | gcc/sel-sched-ir.h | 8 |
7 files changed, 38 insertions, 35 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c4cd4c6..b2d3ab3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-11-22 Nathan Sidwell <nathan@acm.org> + + * gcc-ar.c (main): Fix indentation. + * gcov-io.c (gcov_write_summary): Remove extraneous {...} + * ggc-page.c (move_ptes_to_front): Fix formatting. + * hsa-dump.c (dump_has_cfun): Fix indentation. + * sel-sched-ir.h: Remove trailing blank lines. + 2016-11-22 Jakub Jelinek <jakub@redhat.com> Alexander Monakov <amonakov@ispras.ru> diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f2ea179..7383fd4 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2016-11-22 Nathan Sidwell <nathan@acm.org> + + * array-notation-common.c (cilkplus_extract_an_trplets): Fix + indentation. + 2016-11-21 Martin Sebor <msebor@redhat.com> * c.opt (-fprintf-return-value): Enable by default. diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c index 2146d22..8818ed7 100644 --- a/gcc/c-family/array-notation-common.c +++ b/gcc/c-family/array-notation-common.c @@ -621,21 +621,21 @@ cilkplus_extract_an_triplets (vec<tree, va_gc> *list, size_t size, size_t rank, break; } } - for (size_t ii = 0; ii < size; ii++) - if (TREE_CODE ((*list)[ii]) == ARRAY_NOTATION_REF) - for (size_t jj = 0; jj < rank; jj++) - { - tree ii_tree = array_exprs[ii][jj]; - (*node)[ii][jj].is_vector = true; - (*node)[ii][jj].value = ARRAY_NOTATION_ARRAY (ii_tree); - (*node)[ii][jj].start = ARRAY_NOTATION_START (ii_tree); - (*node)[ii][jj].length = - fold_build1 (CONVERT_EXPR, integer_type_node, - ARRAY_NOTATION_LENGTH (ii_tree)); - (*node)[ii][jj].stride = - fold_build1 (CONVERT_EXPR, integer_type_node, - ARRAY_NOTATION_STRIDE (ii_tree)); - } + for (size_t ii = 0; ii < size; ii++) + if (TREE_CODE ((*list)[ii]) == ARRAY_NOTATION_REF) + for (size_t jj = 0; jj < rank; jj++) + { + tree ii_tree = array_exprs[ii][jj]; + (*node)[ii][jj].is_vector = true; + (*node)[ii][jj].value = ARRAY_NOTATION_ARRAY (ii_tree); + (*node)[ii][jj].start = ARRAY_NOTATION_START (ii_tree); + (*node)[ii][jj].length = + fold_build1 (CONVERT_EXPR, integer_type_node, + ARRAY_NOTATION_LENGTH (ii_tree)); + (*node)[ii][jj].stride = + fold_build1 (CONVERT_EXPR, integer_type_node, + ARRAY_NOTATION_STRIDE (ii_tree)); + } release_vec_vec (array_exprs); } diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c index a02dccb..fc51cac 100644 --- a/gcc/gcc-ar.c +++ b/gcc/gcc-ar.c @@ -162,7 +162,7 @@ main (int ac, char **av) len = strlen (arg); if (len > 0) - len--; + len--; end = arg + len; /* Always add a dir separator for the prefix list. */ diff --git a/gcc/gcov-io.c b/gcc/gcov-io.c index 731c2cf..a1b247b 100644 --- a/gcc/gcov-io.c +++ b/gcc/gcov-io.c @@ -421,13 +421,11 @@ gcov_write_summary (gcov_unsigned_t tag, const struct gcov_summary *summary) histo_bitvector[bv_ix] = 0; csum = &summary->ctrs[GCOV_COUNTER_ARCS]; for (h_ix = 0; h_ix < GCOV_HISTOGRAM_SIZE; h_ix++) - { - if (csum->histogram[h_ix].num_counters > 0) - { - histo_bitvector[h_ix / 32] |= 1 << (h_ix % 32); - h_cnt++; - } - } + if (csum->histogram[h_ix].num_counters) + { + histo_bitvector[h_ix / 32] |= 1 << (h_ix % 32); + h_cnt++; + } gcov_write_tag_length (tag, GCOV_TAG_SUMMARY_LENGTH (h_cnt)); gcov_write_unsigned (summary->checksum); for (csum = summary->ctrs, ix = GCOV_COUNTERS_SUMMABLE; ix--; csum++) diff --git a/gcc/hsa-dump.c b/gcc/hsa-dump.c index 985caca..aea9505 100644 --- a/gcc/hsa-dump.c +++ b/gcc/hsa-dump.c @@ -1130,10 +1130,10 @@ dump_hsa_cfun (FILE *f) } FOR_ALL_BB_FN (bb, cfun) - { - hsa_bb *hbb = (struct hsa_bb *) bb->aux; - dump_hsa_bb (f, hbb); - } + { + hsa_bb *hbb = (struct hsa_bb *) bb->aux; + dump_hsa_bb (f, hbb); + } } /* Dump textual representation of HSA IL instruction INSN to stderr. */ diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index a8bb2d1..4caf3df 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -1669,11 +1669,3 @@ extern void alloc_sched_pools (void); extern void free_sched_pools (void); #endif /* GCC_SEL_SCHED_IR_H */ - - - - - - - - |