From 8eea7f7fe97249cf7e3fc584b3c44be20ab96d62 Mon Sep 17 00:00:00 2001 From: zrj Date: Mon, 22 Jan 2018 09:45:18 +0200 Subject: [PATCH] gcc50: Backport c++11 literal fixes from gcc80. Fixes: -Wliteral-suffix C++11 requires a space between literal and string macro While there, backport 222884 to suppress -Wdeprecated use of an operand of type 'bool' in 'operator++' is deprecated --- contrib/gcc-5.0/gcc/bitmap.c | 6 +-- contrib/gcc-5.0/gcc/c/c-aux-info.c | 2 +- contrib/gcc-5.0/gcc/cfg.c | 4 +- contrib/gcc-5.0/gcc/cfghooks.c | 2 +- contrib/gcc-5.0/gcc/cgraph.c | 6 +-- contrib/gcc-5.0/gcc/config/elfos.h | 4 +- contrib/gcc-5.0/gcc/cppbuiltin.c | 2 +- contrib/gcc-5.0/gcc/defaults.h | 2 +- contrib/gcc-5.0/gcc/dwarf2cfi.c | 8 ++-- contrib/gcc-5.0/gcc/dwarf2out.c | 2 +- contrib/gcc-5.0/gcc/final.c | 2 +- contrib/gcc-5.0/gcc/gcc.c | 4 +- contrib/gcc-5.0/gcc/gcov.c | 2 +- contrib/gcc-5.0/gcc/ipa-cp.c | 4 +- contrib/gcc-5.0/gcc/ipa-inline.c | 38 +++++++++--------- contrib/gcc-5.0/gcc/ipa-polymorphic-call.c | 4 +- contrib/gcc-5.0/gcc/ipa-profile.c | 8 ++-- contrib/gcc-5.0/gcc/ipa-prop.c | 2 +- contrib/gcc-5.0/gcc/ira-color.c | 2 +- contrib/gcc-5.0/gcc/ira.c | 14 +++---- contrib/gcc-5.0/gcc/loop-iv.c | 2 +- contrib/gcc-5.0/gcc/mcf.c | 46 +++++++++++----------- contrib/gcc-5.0/gcc/modulo-sched.c | 16 ++++---- contrib/gcc-5.0/gcc/predict.c | 4 +- contrib/gcc-5.0/gcc/profile.c | 12 +++--- contrib/gcc-5.0/gcc/reload.h | 2 +- contrib/gcc-5.0/gcc/stor-layout.c | 2 +- contrib/gcc-5.0/gcc/toplev.c | 2 +- contrib/gcc-5.0/gcc/tree-ssa-reassoc.c | 4 +- contrib/gcc-5.0/gcc/value-prof.c | 42 ++++++++++---------- contrib/gcc-5.0/gcc/wide-int-print.cc | 2 +- gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h | 26 ++++++------ 32 files changed, 139 insertions(+), 139 deletions(-) diff --git a/contrib/gcc-5.0/gcc/bitmap.c b/contrib/gcc-5.0/gcc/bitmap.c index d43a39f7d6..21fc1d2885 100644 --- a/contrib/gcc-5.0/gcc/bitmap.c +++ b/contrib/gcc-5.0/gcc/bitmap.c @@ -2170,8 +2170,8 @@ print_statistics (bitmap_descriptor_d **slot, bitmap_output_info *i) sprintf (s, "%s:%i (%s)", s1, d->line, d->function); s[41] = 0; fprintf (stderr, - "%-41s %9u %15"PRId64" %15"PRId64" %15"PRId64 - " %10"PRId64" %10"PRId64"\n", + "%-41s %9u %15" PRId64" %15" PRId64" %15" PRId64 + " %10" PRId64" %10" PRId64"\n", s, d->created, d->allocated, d->peak, d->current, d->nsearches, d->search_iter); @@ -2204,7 +2204,7 @@ dump_bitmap_statistics (void) bitmap_desc_hash->traverse (&info); fprintf (stderr, "---------------------------------------------------------------------------------\n"); fprintf (stderr, - "%-41s %9"PRId64" %15"PRId64"\n", + "%-41s %9" PRId64" %15" PRId64"\n", "Total", info.count, info.size); fprintf (stderr, "---------------------------------------------------------------------------------\n"); } diff --git a/contrib/gcc-5.0/gcc/c/c-aux-info.c b/contrib/gcc-5.0/gcc/c/c-aux-info.c index fcefcae2fd..d80418e0b2 100644 --- a/contrib/gcc-5.0/gcc/c/c-aux-info.c +++ b/contrib/gcc-5.0/gcc/c/c-aux-info.c @@ -319,7 +319,7 @@ gen_type (const char *ret_val, tree t, formals_style style) else { char buff[23]; - sprintf (buff, "["HOST_WIDE_INT_PRINT_DEC"]", + sprintf (buff, "[" HOST_WIDE_INT_PRINT_DEC"]", int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t))); ret_val = gen_type (concat (ret_val, buff, NULL), diff --git a/contrib/gcc-5.0/gcc/cfg.c b/contrib/gcc-5.0/gcc/cfg.c index d96be45a39..b288bf6b78 100644 --- a/contrib/gcc-5.0/gcc/cfg.c +++ b/contrib/gcc-5.0/gcc/cfg.c @@ -508,7 +508,7 @@ dump_edge_info (FILE *file, edge e, int flags, int do_succ) if (e->count && do_details) { fputs (" count:", file); - fprintf (file, "%"PRId64, e->count); + fprintf (file, "%" PRId64, e->count); } if (e->flags && do_details) @@ -756,7 +756,7 @@ dump_bb_info (FILE *outf, basic_block bb, int indent, int flags, if (flags & TDF_DETAILS) { struct function *fun = DECL_STRUCT_FUNCTION (current_function_decl); - fprintf (outf, ", count " "%"PRId64, + fprintf (outf, ", count " "%" PRId64, (int64_t) bb->count); fprintf (outf, ", freq %i", bb->frequency); if (maybe_hot_bb_p (fun, bb)) diff --git a/contrib/gcc-5.0/gcc/cfghooks.c b/contrib/gcc-5.0/gcc/cfghooks.c index abeab8cf1a..2d4d4cd22c 100644 --- a/contrib/gcc-5.0/gcc/cfghooks.c +++ b/contrib/gcc-5.0/gcc/cfghooks.c @@ -330,7 +330,7 @@ dump_bb_for_graph (pretty_printer *pp, basic_block bb) internal_error ("%s does not support dump_bb_for_graph", cfg_hooks->name); if (bb->count) - pp_printf (pp, "COUNT:" "%"PRId64, bb->count); + pp_printf (pp, "COUNT:" "%" PRId64, bb->count); pp_printf (pp, " FREQ:%i |", bb->frequency); pp_write_text_to_stream (pp); if (!(dump_flags & TDF_SLIM)) diff --git a/contrib/gcc-5.0/gcc/cgraph.c b/contrib/gcc-5.0/gcc/cgraph.c index e25ecb3fb9..ccf77dbc37 100644 --- a/contrib/gcc-5.0/gcc/cgraph.c +++ b/contrib/gcc-5.0/gcc/cgraph.c @@ -1326,7 +1326,7 @@ cgraph_edge::redirect_call_stmt_to_callee (void) if (dump_file) fprintf (dump_file, "Expanding speculative call of %s/%i -> %s/%i count:" - "%"PRId64"\n", + "%" PRId64"\n", xstrdup_for_dump (e->caller->name ()), e->caller->order, xstrdup_for_dump (e->callee->name ()), @@ -1958,7 +1958,7 @@ cgraph_edge::dump_edge_flags (FILE *f) if (indirect_inlining_edge) fprintf (f, "(indirect_inlining) "); if (count) - fprintf (f, "(%"PRId64"x) ", (int64_t)count); + fprintf (f, "(%" PRId64"x) ", (int64_t)count); if (frequency) fprintf (f, "(%.2f per call) ", frequency / (double)CGRAPH_FREQ_BASE); if (can_throw_external) @@ -1994,7 +1994,7 @@ cgraph_node::dump (FILE *f) fprintf (f, " First run: %i\n", tp_first_run); fprintf (f, " Function flags:"); if (count) - fprintf (f, " executed %"PRId64"x", + fprintf (f, " executed %" PRId64"x", (int64_t)count); if (origin) fprintf (f, " nested in: %s", origin->asm_name ()); diff --git a/contrib/gcc-5.0/gcc/config/elfos.h b/contrib/gcc-5.0/gcc/config/elfos.h index c3b9487482..c428a40a64 100644 --- a/contrib/gcc-5.0/gcc/config/elfos.h +++ b/contrib/gcc-5.0/gcc/config/elfos.h @@ -99,7 +99,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef ASM_OUTPUT_SKIP #define ASM_OUTPUT_SKIP(FILE, SIZE) \ - fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ + fprintf ((FILE), "%s" HOST_WIDE_INT_PRINT_UNSIGNED "\n",\ SKIP_ASM_OP, (SIZE)) /* This is how to store into the string LABEL @@ -167,7 +167,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see { \ fprintf ((FILE), "%s", COMMON_ASM_OP); \ assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ + fprintf ((FILE), "," HOST_WIDE_INT_PRINT_UNSIGNED ",%u\n", \ (SIZE), (ALIGN) / BITS_PER_UNIT); \ } \ while (0) diff --git a/contrib/gcc-5.0/gcc/cppbuiltin.c b/contrib/gcc-5.0/gcc/cppbuiltin.c index aae6217cef..d9e9ab4003 100644 --- a/contrib/gcc-5.0/gcc/cppbuiltin.c +++ b/contrib/gcc-5.0/gcc/cppbuiltin.c @@ -143,7 +143,7 @@ static void define_builtin_macros_for_type_sizes (cpp_reader *pfile) { #define define_type_sizeof(NAME, TYPE) \ - cpp_define_formatted (pfile, NAME"="HOST_WIDE_INT_PRINT_DEC, \ + cpp_define_formatted (pfile, NAME"=" HOST_WIDE_INT_PRINT_DEC, \ tree_to_uhwi (TYPE_SIZE_UNIT (TYPE))) define_type_sizeof ("__SIZEOF_INT__", integer_type_node); diff --git a/contrib/gcc-5.0/gcc/defaults.h b/contrib/gcc-5.0/gcc/defaults.h index 1d5479895e..a40f750667 100644 --- a/contrib/gcc-5.0/gcc/defaults.h +++ b/contrib/gcc-5.0/gcc/defaults.h @@ -123,7 +123,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see { \ fprintf ((FILE), "\t%s\t", TLS_COMMON_ASM_OP); \ assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ + fprintf ((FILE), "," HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ (SIZE), DECL_ALIGN (DECL) / BITS_PER_UNIT); \ } \ while (0) diff --git a/contrib/gcc-5.0/gcc/dwarf2cfi.c b/contrib/gcc-5.0/gcc/dwarf2cfi.c index 27474cba07..c3400f6464 100644 --- a/contrib/gcc-5.0/gcc/dwarf2cfi.c +++ b/contrib/gcc-5.0/gcc/dwarf2cfi.c @@ -3258,7 +3258,7 @@ output_cfi_directive (FILE *f, dw_cfi_ref cfi) case DW_CFA_offset_extended: case DW_CFA_offset_extended_sf: r = DWARF2_FRAME_REG_OUT (cfi->dw_cfi_oprnd1.dw_cfi_reg_num, 1); - fprintf (f, "\t.cfi_offset %lu, "HOST_WIDE_INT_PRINT_DEC"\n", + fprintf (f, "\t.cfi_offset %lu, " HOST_WIDE_INT_PRINT_DEC"\n", r, cfi->dw_cfi_oprnd2.dw_cfi_offset); break; @@ -3281,7 +3281,7 @@ output_cfi_directive (FILE *f, dw_cfi_ref cfi) case DW_CFA_def_cfa: case DW_CFA_def_cfa_sf: r = DWARF2_FRAME_REG_OUT (cfi->dw_cfi_oprnd1.dw_cfi_reg_num, 1); - fprintf (f, "\t.cfi_def_cfa %lu, "HOST_WIDE_INT_PRINT_DEC"\n", + fprintf (f, "\t.cfi_def_cfa %lu, " HOST_WIDE_INT_PRINT_DEC"\n", r, cfi->dw_cfi_oprnd2.dw_cfi_offset); break; @@ -3316,13 +3316,13 @@ output_cfi_directive (FILE *f, dw_cfi_ref cfi) fprintf (f, "\t.cfi_escape %#x,", DW_CFA_GNU_args_size); dw2_asm_output_data_uleb128_raw (cfi->dw_cfi_oprnd1.dw_cfi_offset); if (flag_debug_asm) - fprintf (f, "\t%s args_size "HOST_WIDE_INT_PRINT_DEC, + fprintf (f, "\t%s args_size " HOST_WIDE_INT_PRINT_DEC, ASM_COMMENT_START, cfi->dw_cfi_oprnd1.dw_cfi_offset); fputc ('\n', f); } else { - fprintf (f, "\t.cfi_GNU_args_size "HOST_WIDE_INT_PRINT_DEC "\n", + fprintf (f, "\t.cfi_GNU_args_size " HOST_WIDE_INT_PRINT_DEC "\n", cfi->dw_cfi_oprnd1.dw_cfi_offset); } break; diff --git a/contrib/gcc-5.0/gcc/dwarf2out.c b/contrib/gcc-5.0/gcc/dwarf2out.c index 6808cc1591..a754614251 100644 --- a/contrib/gcc-5.0/gcc/dwarf2out.c +++ b/contrib/gcc-5.0/gcc/dwarf2out.c @@ -5450,7 +5450,7 @@ print_dw_val (dw_val_node *val, bool recurse, FILE *outfile) fprintf (outfile, HOST_WIDE_INT_PRINT_UNSIGNED, val->v.val_unsigned); break; case dw_val_class_const_double: - fprintf (outfile, "constant ("HOST_WIDE_INT_PRINT_DEC","\ + fprintf (outfile, "constant (" HOST_WIDE_INT_PRINT_DEC","\ HOST_WIDE_INT_PRINT_UNSIGNED")", val->v.val_double.high, val->v.val_double.low); diff --git a/contrib/gcc-5.0/gcc/final.c b/contrib/gcc-5.0/gcc/final.c index 1fa93d9036..35ef3d9faf 100644 --- a/contrib/gcc-5.0/gcc/final.c +++ b/contrib/gcc-5.0/gcc/final.c @@ -1989,7 +1989,7 @@ dump_basic_block_info (FILE *file, rtx_insn *insn, basic_block *start_to_bb, if (bb->frequency) fprintf (file, " freq:%d", bb->frequency); if (bb->count) - fprintf (file, " count:%"PRId64, + fprintf (file, " count:%" PRId64, bb->count); fprintf (file, " seq:%d", (*bb_seqn)++); fprintf (file, "\n%s PRED:", ASM_COMMENT_START); diff --git a/contrib/gcc-5.0/gcc/gcc.c b/contrib/gcc-5.0/gcc/gcc.c index b70cf912b8..b54d87d478 100644 --- a/contrib/gcc-5.0/gcc/gcc.c +++ b/contrib/gcc-5.0/gcc/gcc.c @@ -771,12 +771,12 @@ proper position among the other output files. */ #define PLUGIN_COND_CLOSE "" #endif #define LINK_PLUGIN_SPEC \ - "%{"PLUGIN_COND": \ + "%{" PLUGIN_COND": \ -plugin %(linker_plugin_file) \ -plugin-opt=%(lto_wrapper) \ -plugin-opt=-fresolution=%u.res \ %{!nostdlib:%{!nodefaultlibs:%:pass-through-libs(%(link_gcc_c_sequence))}} \ - }"PLUGIN_COND_CLOSE + }" PLUGIN_COND_CLOSE #else /* The linker used doesn't support -plugin, reject -fuse-linker-plugin. */ #define LINK_PLUGIN_SPEC "%{fuse-linker-plugin:\ diff --git a/contrib/gcc-5.0/gcc/gcov.c b/contrib/gcc-5.0/gcc/gcov.c index 796b1b9761..60a9d4af11 100644 --- a/contrib/gcc-5.0/gcc/gcov.c +++ b/contrib/gcc-5.0/gcc/gcov.c @@ -1846,7 +1846,7 @@ format_gcov (gcov_type top, gcov_type bottom, int dp) } } else - sprintf (buffer, "%"PRId64, (int64_t)top); + sprintf (buffer, "%" PRId64, (int64_t)top); return buffer; } diff --git a/contrib/gcc-5.0/gcc/ipa-cp.c b/contrib/gcc-5.0/gcc/ipa-cp.c index 81a6ef8e06..6e4668595a 100644 --- a/contrib/gcc-5.0/gcc/ipa-cp.c +++ b/contrib/gcc-5.0/gcc/ipa-cp.c @@ -2202,7 +2202,7 @@ good_cloning_opportunity_p (struct cgraph_node *node, int time_benefit, if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, " good_cloning_opportunity_p (time: %i, " "size: %i, count_sum: " HOST_WIDE_INT_PRINT_DEC - "%s%s) -> evaluation: " "%"PRId64 + "%s%s) -> evaluation: " "%" PRId64 ", threshold: %i\n", time_benefit, size_cost, (HOST_WIDE_INT) count_sum, info->node_within_scc ? ", scc" : "", @@ -2220,7 +2220,7 @@ good_cloning_opportunity_p (struct cgraph_node *node, int time_benefit, if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, " good_cloning_opportunity_p (time: %i, " "size: %i, freq_sum: %i%s%s) -> evaluation: " - "%"PRId64 ", threshold: %i\n", + "%" PRId64 ", threshold: %i\n", time_benefit, size_cost, freq_sum, info->node_within_scc ? ", scc" : "", info->node_calling_single_call ? ", single_call" : "", diff --git a/contrib/gcc-5.0/gcc/ipa-inline.c b/contrib/gcc-5.0/gcc/ipa-inline.c index 7097cf32e5..7fd2374bc5 100644 --- a/contrib/gcc-5.0/gcc/ipa-inline.c +++ b/contrib/gcc-5.0/gcc/ipa-inline.c @@ -1191,8 +1191,8 @@ edge_badness (struct cgraph_edge *edge, bool dump) if (dump) { fprintf (dump_file, - " %f: guessed profile. frequency %f, count %"PRId64 - " caller count %"PRId64 + " %f: guessed profile. frequency %f, count %" PRId64 + " caller count %" PRId64 " time w/o inlining %f, time w inlining %f" " overall growth %i (current) %i (original)" " %i (compensated)\n", @@ -1974,7 +1974,7 @@ inline_small_functions (void) badness.to_double (), edge->frequency / (double)CGRAPH_FREQ_BASE); if (edge->count) - fprintf (dump_file," Called %"PRId64"x\n", + fprintf (dump_file," Called %" PRId64"x\n", edge->count); if (dump_flags & TDF_DETAILS) edge_badness (edge, true); @@ -2261,8 +2261,8 @@ dump_overall_stats (void) sum_weighted += time * node->count; } fprintf (dump_file, "Overall time estimate: " - "%"PRId64" weighted by profile: " - "%"PRId64"\n", sum, sum_weighted); + "%" PRId64" weighted by profile: " + "%" PRId64"\n", sum, sum_weighted); } /* Output some useful stats about inlining. */ @@ -2340,31 +2340,31 @@ dump_inline_stats (void) if (max_count) { fprintf (dump_file, - "Inlined %"PRId64 " + speculative " - "%"PRId64 " + speculative polymorphic " - "%"PRId64 " + previously indirect " - "%"PRId64 " + virtual " - "%"PRId64 " + virtual and previously indirect " - "%"PRId64 "\n" "Not inlined " - "%"PRId64 " + previously indirect " - "%"PRId64 " + virtual " - "%"PRId64 " + virtual and previously indirect " - "%"PRId64 " + stil indirect " - "%"PRId64 " + still indirect polymorphic " - "%"PRId64 "\n", inlined_cnt, + "Inlined %" PRId64 " + speculative " + "%" PRId64 " + speculative polymorphic " + "%" PRId64 " + previously indirect " + "%" PRId64 " + virtual " + "%" PRId64 " + virtual and previously indirect " + "%" PRId64 "\n" "Not inlined " + "%" PRId64 " + previously indirect " + "%" PRId64 " + virtual " + "%" PRId64 " + virtual and previously indirect " + "%" PRId64 " + stil indirect " + "%" PRId64 " + still indirect polymorphic " + "%" PRId64 "\n", inlined_cnt, inlined_speculative, inlined_speculative_ply, inlined_indir_cnt, inlined_virt_cnt, inlined_virt_indir_cnt, noninlined_cnt, noninlined_indir_cnt, noninlined_virt_cnt, noninlined_virt_indir_cnt, indirect_cnt, indirect_poly_cnt); fprintf (dump_file, - "Removed speculations %"PRId64 "\n", + "Removed speculations %" PRId64 "\n", spec_rem); } dump_overall_stats (); fprintf (dump_file, "\nWhy inlining failed?\n"); for (i = 0; i < CIF_N_REASONS; i++) if (reason[i][2]) - fprintf (dump_file, "%-50s: %8i calls, %8i freq, %"PRId64" count\n", + fprintf (dump_file, "%-50s: %8i calls, %8i freq, %" PRId64" count\n", cgraph_inline_failed_string ((cgraph_inline_failed_t) i), (int) reason[i][2], (int) reason[i][1], reason[i][0]); } diff --git a/contrib/gcc-5.0/gcc/ipa-polymorphic-call.c b/contrib/gcc-5.0/gcc/ipa-polymorphic-call.c index 9fd302e03d..0b29b32ea1 100644 --- a/contrib/gcc-5.0/gcc/ipa-polymorphic-call.c +++ b/contrib/gcc-5.0/gcc/ipa-polymorphic-call.c @@ -661,7 +661,7 @@ ipa_polymorphic_call_context::dump (FILE *f, bool newline) const fprintf (f, " (or a derived type)"); if (maybe_in_construction) fprintf (f, " (maybe in construction)"); - fprintf (f, " offset "HOST_WIDE_INT_PRINT_DEC, + fprintf (f, " offset " HOST_WIDE_INT_PRINT_DEC, offset); } if (speculative_outer_type) @@ -672,7 +672,7 @@ ipa_polymorphic_call_context::dump (FILE *f, bool newline) const print_generic_expr (f, speculative_outer_type, TDF_SLIM); if (speculative_maybe_derived_type) fprintf (f, " (or a derived type)"); - fprintf (f, " at offset "HOST_WIDE_INT_PRINT_DEC, + fprintf (f, " at offset " HOST_WIDE_INT_PRINT_DEC, speculative_offset); } } diff --git a/contrib/gcc-5.0/gcc/ipa-profile.c b/contrib/gcc-5.0/gcc/ipa-profile.c index 0929877845..e0d1ddec36 100644 --- a/contrib/gcc-5.0/gcc/ipa-profile.c +++ b/contrib/gcc-5.0/gcc/ipa-profile.c @@ -186,7 +186,7 @@ dump_histogram (FILE *file, vec histogram) { cumulated_time += histogram[i]->count * histogram[i]->time; cumulated_size += histogram[i]->size; - fprintf (file, " %"PRId64": time:%i (%2.2f) size:%i (%2.2f)\n", + fprintf (file, " %" PRId64": time:%i (%2.2f) size:%i (%2.2f)\n", (int64_t) histogram[i]->count, histogram[i]->time, cumulated_time * 100.0 / overall_time, @@ -542,7 +542,7 @@ ipa_profile (void) { gcov_type min, cumulated_time = 0, cumulated_size = 0; - fprintf (dump_file, "Overall time: %"PRId64"\n", + fprintf (dump_file, "Overall time: %" PRId64"\n", (int64_t)overall_time); min = get_hot_bb_threshold (); for (i = 0; i < (int)histogram.length () && histogram[i]->count >= min; @@ -551,7 +551,7 @@ ipa_profile (void) cumulated_time += histogram[i]->count * histogram[i]->time; cumulated_size += histogram[i]->size; } - fprintf (dump_file, "GCOV min count: %"PRId64 + fprintf (dump_file, "GCOV min count: %" PRId64 " Time:%3.2f%% Size:%3.2f%%\n", (int64_t)min, cumulated_time * 100.0 / overall_time, @@ -577,7 +577,7 @@ ipa_profile (void) cumulated_time += histogram[i]->count * histogram[i]->time; cumulated_size += histogram[i]->size; } - fprintf (dump_file, "Determined min count: %"PRId64 + fprintf (dump_file, "Determined min count: %" PRId64 " Time:%3.2f%% Size:%3.2f%%\n", (int64_t)threshold, cumulated_time * 100.0 / overall_time, diff --git a/contrib/gcc-5.0/gcc/ipa-prop.c b/contrib/gcc-5.0/gcc/ipa-prop.c index a7515f1791..ac43dd9875 100644 --- a/contrib/gcc-5.0/gcc/ipa-prop.c +++ b/contrib/gcc-5.0/gcc/ipa-prop.c @@ -300,7 +300,7 @@ ipa_print_node_jump_functions_for_edge (FILE *f, struct cgraph_edge *cs) else if (type == IPA_JF_ANCESTOR) { fprintf (f, "ANCESTOR: "); - fprintf (f, "%d, offset "HOST_WIDE_INT_PRINT_DEC, + fprintf (f, "%d, offset " HOST_WIDE_INT_PRINT_DEC, jump_func->value.ancestor.formal_id, jump_func->value.ancestor.offset); if (jump_func->value.ancestor.agg_preserved) diff --git a/contrib/gcc-5.0/gcc/ira-color.c b/contrib/gcc-5.0/gcc/ira-color.c index e104f00d3a..aaa3ea4e2f 100644 --- a/contrib/gcc-5.0/gcc/ira-color.c +++ b/contrib/gcc-5.0/gcc/ira-color.c @@ -548,7 +548,7 @@ print_hard_regs_subforest (FILE *f, allocno_hard_regs_node_t roots, fprintf (f, " "); fprintf (f, "%d:(", node->preorder_num); print_hard_reg_set (f, node->hard_regs->set, false); - fprintf (f, ")@%"PRId64"\n", node->hard_regs->cost); + fprintf (f, ")@%" PRId64"\n", node->hard_regs->cost); print_hard_regs_subforest (f, node->first, level + 1); } } diff --git a/contrib/gcc-5.0/gcc/ira.c b/contrib/gcc-5.0/gcc/ira.c index cbc5bd0fe2..72e1043ba7 100644 --- a/contrib/gcc-5.0/gcc/ira.c +++ b/contrib/gcc-5.0/gcc/ira.c @@ -2508,12 +2508,12 @@ calculate_allocation_cost (void) if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL) { fprintf (ira_dump_file, - "+++Costs: overall %"PRId64 - ", reg %"PRId64 - ", mem %"PRId64 - ", ld %"PRId64 - ", st %"PRId64 - ", move %"PRId64, + "+++Costs: overall %" PRId64 + ", reg %" PRId64 + ", mem %" PRId64 + ", ld %" PRId64 + ", st %" PRId64 + ", move %" PRId64, ira_overall_cost, ira_reg_cost, ira_mem_cost, ira_load_cost, ira_store_cost, ira_shuffle_cost); fprintf (ira_dump_file, "\n+++ move loops %d, new jumps %d\n", @@ -5467,7 +5467,7 @@ do_reload (void) if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL && overall_cost_before != ira_overall_cost) - fprintf (ira_dump_file, "+++Overall after reload %"PRId64 "\n", + fprintf (ira_dump_file, "+++Overall after reload %" PRId64 "\n", ira_overall_cost); flag_ira_share_spill_slots = saved_flag_ira_share_spill_slots; diff --git a/contrib/gcc-5.0/gcc/loop-iv.c b/contrib/gcc-5.0/gcc/loop-iv.c index de2b15a8fe..f7008cd21e 100644 --- a/contrib/gcc-5.0/gcc/loop-iv.c +++ b/contrib/gcc-5.0/gcc/loop-iv.c @@ -2357,7 +2357,7 @@ determine_max_iter (struct loop *loop, struct niter_desc *desc, rtx old_niter) if (andmax) nmax = MIN (nmax, andmax); if (dump_file) - fprintf (dump_file, ";; Determined upper bound %"PRId64".\n", + fprintf (dump_file, ";; Determined upper bound %" PRId64".\n", nmax); return nmax; } diff --git a/contrib/gcc-5.0/gcc/mcf.c b/contrib/gcc-5.0/gcc/mcf.c index db96eb1127..9dacde2d78 100644 --- a/contrib/gcc-5.0/gcc/mcf.c +++ b/contrib/gcc-5.0/gcc/mcf.c @@ -214,12 +214,12 @@ dump_fixup_edge (FILE *file, fixup_graph_type *fixup_graph, fixup_edge_p fedge) if (fedge->type) { - fprintf (file, "flow/capacity=%"PRId64 "/", + fprintf (file, "flow/capacity=%" PRId64 "/", fedge->flow); if (fedge->max_capacity == CAP_INFINITY) fputs ("+oo,", file); else - fprintf (file, "%"PRId64 ",", fedge->max_capacity); + fprintf (file, "%" PRId64 ",", fedge->max_capacity); } if (fedge->is_rflow_valid) @@ -227,10 +227,10 @@ dump_fixup_edge (FILE *file, fixup_graph_type *fixup_graph, fixup_edge_p fedge) if (fedge->rflow == CAP_INFINITY) fputs (" rflow=+oo.", file); else - fprintf (file, " rflow=%"PRId64 ",", fedge->rflow); + fprintf (file, " rflow=%" PRId64 ",", fedge->rflow); } - fprintf (file, " cost=%"PRId64 ".", fedge->cost); + fprintf (file, " cost=%" PRId64 ".", fedge->cost); fprintf (file, "\t(%d->%d)", fedge->src, fedge->dest); @@ -637,9 +637,9 @@ create_fixup_graph (fixup_graph_type *fixup_graph) if (dump_file) { fprintf (dump_file, "\nAdjust supply and demand:\n"); - fprintf (dump_file, "supply_value=%"PRId64 "\n", + fprintf (dump_file, "supply_value=%" PRId64 "\n", supply_value); - fprintf (dump_file, "demand_value=%"PRId64 "\n", + fprintf (dump_file, "demand_value=%" PRId64 "\n", demand_value); } @@ -909,10 +909,10 @@ cancel_negative_cycle (fixup_graph_type *fixup_graph, { fprintf (dump_file, "%d", cycle[k]); fprintf (dump_file, - ": (%"PRId64 ", %"PRId64 + ": (%" PRId64 ", %" PRId64 ")\n", sum_cost, cycle_flow); fprintf (dump_file, - "Augment cycle with %"PRId64 "\n", + "Augment cycle with %" PRId64 "\n", cycle_flow); } @@ -1104,10 +1104,10 @@ find_max_flow (fixup_graph_type *fixup_graph, int source, int sink) fprintf (dump_file, "<-"); } fprintf (dump_file, - "ENTRY (path_capacity=%"PRId64 ")\n", + "ENTRY (path_capacity=%" PRId64 ")\n", increment); fprintf (dump_file, - "Network flow is %"PRId64 ".\n", + "Network flow is %" PRId64 ".\n", max_flow); } } @@ -1144,7 +1144,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) /* Fixup BB. */ if (dump_file) fprintf (dump_file, - "BB%d: %"PRId64 "", bb->index, bb->count); + "BB%d: %" PRId64 "", bb->index, bb->count); pfedge = find_fixup_edge (fixup_graph, i, i + 1); if (pfedge->flow) @@ -1152,7 +1152,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) bb->count += pfedge->flow; if (dump_file) { - fprintf (dump_file, " + %"PRId64 "(", + fprintf (dump_file, " + %" PRId64 "(", pfedge->flow); print_edge (dump_file, fixup_graph, i, i + 1); fprintf (dump_file, ")"); @@ -1167,7 +1167,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) bb->count -= pfedge_n->flow; if (dump_file) { - fprintf (dump_file, " - %"PRId64 "(", + fprintf (dump_file, " - %" PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, i + 1, pfedge->norm_vertex_index); @@ -1175,7 +1175,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) } } if (dump_file) - fprintf (dump_file, " = %"PRId64 "\n", bb->count); + fprintf (dump_file, " = %" PRId64 "\n", bb->count); /* Fixup edge. */ FOR_EACH_EDGE (e, ei, bb->succs) @@ -1186,7 +1186,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) j = 2 * e->dest->index; if (dump_file) - fprintf (dump_file, "%d->%d: %"PRId64 "", + fprintf (dump_file, "%d->%d: %" PRId64 "", bb->index, e->dest->index, e->count); pfedge = find_fixup_edge (fixup_graph, i + 1, j); @@ -1199,7 +1199,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) e->count += pfedge->flow; if (dump_file) { - fprintf (dump_file, " + %"PRId64 "(", + fprintf (dump_file, " + %" PRId64 "(", pfedge->flow); print_edge (dump_file, fixup_graph, i + 1, j); fprintf (dump_file, ")"); @@ -1214,7 +1214,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) e->count -= pfedge_n->flow; if (dump_file) { - fprintf (dump_file, " - %"PRId64 "(", + fprintf (dump_file, " - %" PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, j, pfedge->norm_vertex_index); @@ -1234,7 +1234,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) if (dump_file) { fprintf (dump_file, "(self edge)"); - fprintf (dump_file, " + %"PRId64 "(", + fprintf (dump_file, " + %" PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, i + 1, pfedge->norm_vertex_index); @@ -1245,7 +1245,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) if (bb->count) e->probability = REG_BR_PROB_BASE * e->count / bb->count; if (dump_file) - fprintf (dump_file, " = %"PRId64 "\t(%.1f%%)\n", + fprintf (dump_file, " = %" PRId64 "\t(%.1f%%)\n", e->count, e->probability * 100.0 / REG_BR_PROB_BASE); } } @@ -1298,14 +1298,14 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) || (bb->count != sum_edge_counts (bb->succs))) { fprintf (dump_file, - "BB%d(%"PRId64 ") **INVALID**: ", + "BB%d(%" PRId64 ") **INVALID**: ", bb->index, bb->count); fprintf (stderr, - "******** BB%d(%"PRId64 + "******** BB%d(%" PRId64 ") **INVALID**: \n", bb->index, bb->count); - fprintf (dump_file, "in_edges=%"PRId64 " ", + fprintf (dump_file, "in_edges=%" PRId64 " ", sum_edge_counts (bb->preds)); - fprintf (dump_file, "out_edges=%"PRId64 "\n", + fprintf (dump_file, "out_edges=%" PRId64 "\n", sum_edge_counts (bb->succs)); } } diff --git a/contrib/gcc-5.0/gcc/modulo-sched.c b/contrib/gcc-5.0/gcc/modulo-sched.c index a5da8b42cc..13a01d6221 100644 --- a/contrib/gcc-5.0/gcc/modulo-sched.c +++ b/contrib/gcc-5.0/gcc/modulo-sched.c @@ -1487,15 +1487,15 @@ sms_schedule (void) if (profile_info && flag_branch_probabilities) { fprintf (dump_file, "SMS loop-count "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) bb->count); fprintf (dump_file, "\n"); fprintf (dump_file, "SMS trip-count "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) trip_count); fprintf (dump_file, "\n"); fprintf (dump_file, "SMS profile-sum-max "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) profile_info->sum_max); fprintf (dump_file, "\n"); } @@ -1609,11 +1609,11 @@ sms_schedule (void) if (profile_info && flag_branch_probabilities) { fprintf (dump_file, "SMS loop-count "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) bb->count); fprintf (dump_file, "\n"); fprintf (dump_file, "SMS profile-sum-max "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) profile_info->sum_max); fprintf (dump_file, "\n"); } @@ -1640,7 +1640,7 @@ sms_schedule (void) if (dump_file && count_init) { fprintf (dump_file, "SMS const-doloop "); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, loop_count); fprintf (dump_file, "\n"); } @@ -1701,9 +1701,9 @@ sms_schedule (void) fprintf (dump_file, "SMS failed... \n"); fprintf (dump_file, "SMS sched-failed (stage-count=%d," " loop-count=", stage_count); - fprintf (dump_file, "%"PRId64, loop_count); + fprintf (dump_file, "%" PRId64, loop_count); fprintf (dump_file, ", trip-count="); - fprintf (dump_file, "%"PRId64, trip_count); + fprintf (dump_file, "%" PRId64, trip_count); fprintf (dump_file, ")\n"); } break; diff --git a/contrib/gcc-5.0/gcc/predict.c b/contrib/gcc-5.0/gcc/predict.c index 67d5d20102..1568633561 100644 --- a/contrib/gcc-5.0/gcc/predict.c +++ b/contrib/gcc-5.0/gcc/predict.c @@ -714,10 +714,10 @@ dump_prediction (FILE *file, enum br_predictor predictor, int probability, if (bb->count) { - fprintf (file, " exec %"PRId64, bb->count); + fprintf (file, " exec %" PRId64, bb->count); if (e) { - fprintf (file, " hit %"PRId64, e->count); + fprintf (file, " hit %" PRId64, e->count); fprintf (file, " (%.1f%%)", e->count * 100.0 / bb->count); } } diff --git a/contrib/gcc-5.0/gcc/profile.c b/contrib/gcc-5.0/gcc/profile.c index a178a1b4e3..abc1aadafd 100644 --- a/contrib/gcc-5.0/gcc/profile.c +++ b/contrib/gcc-5.0/gcc/profile.c @@ -276,7 +276,7 @@ get_working_sets (void) ws_info = &gcov_working_sets[ws_ix]; /* Print out the percentage using int arithmatic to avoid float. */ fprintf (dump_file, "\t\t%u.%02u%%: num counts=%u, min counter=" - "%"PRId64 "\n", + "%" PRId64 "\n", pct / 100, pct - (pct / 100 * 100), ws_info->num_counters, (int64_t)ws_info->min_counter); @@ -357,7 +357,7 @@ is_edge_inconsistent (vec *edges) if (dump_file) { fprintf (dump_file, - "Edge %i->%i is inconsistent, count%"PRId64, + "Edge %i->%i is inconsistent, count%" PRId64, e->src->index, e->dest->index, e->count); dump_bb (dump_file, e->src, 0, TDF_DETAILS); dump_bb (dump_file, e->dest, 0, TDF_DETAILS); @@ -406,7 +406,7 @@ is_inconsistent (void) if (dump_file) { fprintf (dump_file, "BB %i count is negative " - "%"PRId64, + "%" PRId64, bb->index, bb->count); dump_bb (dump_file, bb, 0, TDF_DETAILS); @@ -418,7 +418,7 @@ is_inconsistent (void) if (dump_file) { fprintf (dump_file, "BB %i count does not match sum of incoming edges " - "%"PRId64" should be %"PRId64, + "%" PRId64" should be %" PRId64, bb->index, bb->count, sum_edge_counts (bb->preds)); @@ -433,7 +433,7 @@ is_inconsistent (void) if (dump_file) { fprintf (dump_file, "BB %i count does not match sum of outgoing edges " - "%"PRId64" should be %"PRId64, + "%" PRId64" should be %" PRId64, bb->index, bb->count, sum_edge_counts (bb->succs)); @@ -510,7 +510,7 @@ read_profile_edge_counts (gcov_type *exec_counts) { fprintf (dump_file, "\nRead edge from %i to %i, count:", bb->index, e->dest->index); - fprintf (dump_file, "%"PRId64, + fprintf (dump_file, "%" PRId64, (int64_t) e->count); } } diff --git a/contrib/gcc-5.0/gcc/reload.h b/contrib/gcc-5.0/gcc/reload.h index c777e54124..0db3813395 100644 --- a/contrib/gcc-5.0/gcc/reload.h +++ b/contrib/gcc-5.0/gcc/reload.h @@ -168,7 +168,7 @@ struct target_reload { value indicates the level of indirect addressing supported, e.g., two means that (MEM (MEM (REG n))) is also valid if (REG n) does not get a hard register. */ - bool x_spill_indirect_levels; + unsigned char x_spill_indirect_levels; /* True if caller-save has been reinitialized. */ bool x_caller_save_initialized_p; diff --git a/contrib/gcc-5.0/gcc/stor-layout.c b/contrib/gcc-5.0/gcc/stor-layout.c index 5bc8a29178..153bcd2007 100644 --- a/contrib/gcc-5.0/gcc/stor-layout.c +++ b/contrib/gcc-5.0/gcc/stor-layout.c @@ -262,7 +262,7 @@ self_referential_size (tree size) fntype = build_function_type (return_type, param_type_list); /* Build the function declaration. */ - sprintf (buf, "SZ"HOST_WIDE_INT_PRINT_UNSIGNED, fnno++); + sprintf (buf, "SZ" HOST_WIDE_INT_PRINT_UNSIGNED, fnno++); fnname = get_file_function_name (buf); fndecl = build_decl (input_location, FUNCTION_DECL, fnname, fntype); for (t = param_decl_list; t; t = DECL_CHAIN (t)) diff --git a/contrib/gcc-5.0/gcc/toplev.c b/contrib/gcc-5.0/gcc/toplev.c index cb6c51739f..51b0ad294f 100644 --- a/contrib/gcc-5.0/gcc/toplev.c +++ b/contrib/gcc-5.0/gcc/toplev.c @@ -1122,7 +1122,7 @@ output_stack_usage (void) } fprintf (stack_usage_file, - "%s:%d:%d:%s\t"HOST_WIDE_INT_PRINT_DEC"\t%s\n", + "%s:%d:%d:%s\t" HOST_WIDE_INT_PRINT_DEC"\t%s\n", lbasename (loc.file), loc.line, loc.column, diff --git a/contrib/gcc-5.0/gcc/tree-ssa-reassoc.c b/contrib/gcc-5.0/gcc/tree-ssa-reassoc.c index 0710bae7de..c694557a1a 100644 --- a/contrib/gcc-5.0/gcc/tree-ssa-reassoc.c +++ b/contrib/gcc-5.0/gcc/tree-ssa-reassoc.c @@ -4599,7 +4599,7 @@ attempt_builtin_powi (gimple stmt, vec *ops) if (elt < vec_len - 1) fputs (" * ", dump_file); } - fprintf (dump_file, ")^"HOST_WIDE_INT_PRINT_DEC"\n", + fprintf (dump_file, ")^" HOST_WIDE_INT_PRINT_DEC"\n", power); } } @@ -4633,7 +4633,7 @@ attempt_builtin_powi (gimple stmt, vec *ops) if (elt < vec_len - 1) fputs (" * ", dump_file); } - fprintf (dump_file, ")^"HOST_WIDE_INT_PRINT_DEC"\n", power); + fprintf (dump_file, ")^" HOST_WIDE_INT_PRINT_DEC"\n", power); } reassociate_stats.pows_created++; diff --git a/contrib/gcc-5.0/gcc/value-prof.c b/contrib/gcc-5.0/gcc/value-prof.c index b16bce8746..7252449d4b 100644 --- a/contrib/gcc-5.0/gcc/value-prof.c +++ b/contrib/gcc-5.0/gcc/value-prof.c @@ -296,10 +296,10 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) unsigned int i; fprintf (dump_file, " ["); for (i = 0; i < hist->hdata.intvl.steps; i++) - fprintf (dump_file, " %d:%"PRId64, + fprintf (dump_file, " %d:%" PRId64, hist->hdata.intvl.int_start + i, (int64_t) hist->hvalue.counters[i]); - fprintf (dump_file, " ] outside range:%"PRId64, + fprintf (dump_file, " ] outside range:%" PRId64, (int64_t) hist->hvalue.counters[i]); } fprintf (dump_file, ".\n"); @@ -309,8 +309,8 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Pow2 counter "); if (hist->hvalue.counters) { - fprintf (dump_file, "pow2:%"PRId64 - " nonpow2:%"PRId64, + fprintf (dump_file, "pow2:%" PRId64 + " nonpow2:%" PRId64, (int64_t) hist->hvalue.counters[0], (int64_t) hist->hvalue.counters[1]); } @@ -321,9 +321,9 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Single value "); if (hist->hvalue.counters) { - fprintf (dump_file, "value:%"PRId64 - " match:%"PRId64 - " wrong:%"PRId64, + fprintf (dump_file, "value:%" PRId64 + " match:%" PRId64 + " wrong:%" PRId64, (int64_t) hist->hvalue.counters[0], (int64_t) hist->hvalue.counters[1], (int64_t) hist->hvalue.counters[2]); @@ -335,8 +335,8 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Average value "); if (hist->hvalue.counters) { - fprintf (dump_file, "sum:%"PRId64 - " times:%"PRId64, + fprintf (dump_file, "sum:%" PRId64 + " times:%" PRId64, (int64_t) hist->hvalue.counters[0], (int64_t) hist->hvalue.counters[1]); } @@ -347,7 +347,7 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "IOR value "); if (hist->hvalue.counters) { - fprintf (dump_file, "ior:%"PRId64, + fprintf (dump_file, "ior:%" PRId64, (int64_t) hist->hvalue.counters[0]); } fprintf (dump_file, ".\n"); @@ -357,9 +357,9 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Constant delta "); if (hist->hvalue.counters) { - fprintf (dump_file, "value:%"PRId64 - " match:%"PRId64 - " wrong:%"PRId64, + fprintf (dump_file, "value:%" PRId64 + " match:%" PRId64 + " wrong:%" PRId64, (int64_t) hist->hvalue.counters[0], (int64_t) hist->hvalue.counters[1], (int64_t) hist->hvalue.counters[2]); @@ -370,9 +370,9 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Indirect call "); if (hist->hvalue.counters) { - fprintf (dump_file, "value:%"PRId64 - " match:%"PRId64 - " all:%"PRId64, + fprintf (dump_file, "value:%" PRId64 + " match:%" PRId64 + " all:%" PRId64, (int64_t) hist->hvalue.counters[0], (int64_t) hist->hvalue.counters[1], (int64_t) hist->hvalue.counters[2]); @@ -383,7 +383,7 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) fprintf (dump_file, "Time profile "); if (hist->hvalue.counters) { - fprintf (dump_file, "time:%"PRId64, + fprintf (dump_file, "time:%" PRId64, (int64_t) hist->hvalue.counters[0]); } fprintf (dump_file, ".\n"); @@ -394,10 +394,10 @@ dump_histogram_value (FILE *dump_file, histogram_value hist) { int i; - fprintf (dump_file, "accu:%"PRId64, hist->hvalue.counters[0]); + fprintf (dump_file, "accu:%" PRId64, hist->hvalue.counters[0]); for (i = 1; i < (GCOV_ICALL_TOPN_VAL << 2); i += 2) { - fprintf (dump_file, " target:%"PRId64 " value:%"PRId64, + fprintf (dump_file, " target:%" PRId64 " value:%" PRId64, (int64_t) hist->hvalue.counters[i], (int64_t) hist->hvalue.counters[i+1]); } @@ -1666,8 +1666,8 @@ gimple_ic_transform (gimple_stmt_iterator *gsi) print_generic_expr (dump_file, direct_call->decl, TDF_SLIM); fprintf (dump_file, " transformation on insn postponned to ipa-profile"); print_gimple_stmt (dump_file, stmt, 0, TDF_SLIM); - fprintf (dump_file, "hist->count %"PRId64 - " hist->all %"PRId64"\n", count, all); + fprintf (dump_file, "hist->count %" PRId64 + " hist->all %" PRId64"\n", count, all); } return true; diff --git a/contrib/gcc-5.0/gcc/wide-int-print.cc b/contrib/gcc-5.0/gcc/wide-int-print.cc index 7b81fc2f22..ead67714a3 100644 --- a/contrib/gcc-5.0/gcc/wide-int-print.cc +++ b/contrib/gcc-5.0/gcc/wide-int-print.cc @@ -127,7 +127,7 @@ print_hex (const wide_int_ref &wi, char *buf) } else - buf += sprintf (buf, "0x"HOST_WIDE_INT_PRINT_HEX_PURE, wi.elt (--i)); + buf += sprintf (buf, "0x" HOST_WIDE_INT_PRINT_HEX_PURE, wi.elt (--i)); while (--i >= 0) buf += sprintf (buf, HOST_WIDE_INT_PRINT_PADDED_HEX, wi.elt (i)); diff --git a/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h b/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h index a9cb942346..dbfbf03179 100644 --- a/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h +++ b/gnu/usr.bin/cc50/cc_prep/config/dragonfly-native.h @@ -23,22 +23,22 @@ #undef LINK_SPEC #define LINK_SPEC DFBSD_LINK_SPEC \ -"%{pg: -L"PREFIX2"/lib/gcc"GCCSHORTVER"/profile \ - %{!static: "RUNPATH" /usr/lib/gcc"GCCSHORTVER"/profile} \ +"%{pg: -L" PREFIX2 "/lib/gcc" GCCSHORTVER "/profile \ + %{!static: " RUNPATH " /usr/lib/gcc" GCCSHORTVER "/profile} \ } \ - -L"PREFIX2"/lib/gcc"GCCSHORTVER" \ - %{!static: "RUNPATH" /usr/lib/gcc"GCCSHORTVER"} \ + -L" PREFIX2 "/lib/gcc" GCCSHORTVER " \ + %{!static: " RUNPATH " /usr/lib/gcc" GCCSHORTVER "} \ %{pg: \ %{!nostdlib: \ - %{!nodefaultlibs: -L"PREFIX2"/lib/profile \ - %{!static: "RUNPATH" /usr/lib/profile} \ + %{!nodefaultlibs: -L" PREFIX2 "/lib/profile \ + %{!static: " RUNPATH " /usr/lib/profile} \ } \ } \ }" -#define NATIVE_SYSTEM_HEADER_DIR PREFIX2"/include" -#define STD_EXEC_PATH PREFIX1"/libexec/gcc"GCCSHORTVER -#define STANDARD_EXEC_PREFIX STD_EXEC_PATH"/" +#define NATIVE_SYSTEM_HEADER_DIR PREFIX2 "/include" +#define STD_EXEC_PATH PREFIX1 "/libexec/gcc" GCCSHORTVER +#define STANDARD_EXEC_PREFIX STD_EXEC_PATH "/" #define STANDARD_LIBEXEC_PREFIX STANDARD_EXEC_PREFIX #define STANDARD_BINDIR_PREFIX STANDARD_EXEC_PREFIX #define STANDARD_STARTFILE_PREFIX STANDARD_EXEC_PREFIX @@ -49,14 +49,14 @@ #define MD_STARTFILE_PREFIX_1 "" #define TOOLDIR_BASE_PREFIX "./" -#define STARTFILE_PREFIX_SPEC PREFIX2"/lib/gcc"GCCSHORTVER"/ "PREFIX2"/lib/" +#define STARTFILE_PREFIX_SPEC PREFIX2 "/lib/gcc" GCCSHORTVER "/ " PREFIX2 "/lib/" -#define GPLUSPLUS_INCLUDE_DIR PREFIX2"/include/c++/"GCCPOINTVER +#define GPLUSPLUS_INCLUDE_DIR PREFIX2 "/include/c++/" GCCPOINTVER #define GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT 0 #undef GPLUSPLUS_TOOL_INCLUDE_DIR -#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX2"/include/c++/"GCCPOINTVER"/backward" +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX2 "/include/c++/" GCCPOINTVER "/backward" #undef LOCAL_INCLUDE_DIR -#define GCC_INCLUDE_DIR PREFIX2"/libdata/gcc"GCCSHORTVER +#define GCC_INCLUDE_DIR PREFIX2 "/libdata/gcc" GCCSHORTVER #undef FIXED_INCLUDE_DIR #undef CROSS_INCLUDE_DIR #undef TOOL_INCLUDE_DIR -- 2.11.4.GIT