diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2010-11-10 23:23:15 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2010-11-10 23:23:15 +0000 |
| commit | d8a07487de259ee4dc9c0d83264a6bd882967514 (patch) | |
| tree | 87f23d33beb3caf203a0b7c3854fe63f47989386 /gcc | |
| parent | 5ca2bc5e88a4b2f0370d7b532438029b1c8d2661 (diff) | |
| download | gcc-d8a07487de259ee4dc9c0d83264a6bd882967514.tar.gz | |
cfgloop.c (verify_loop_structure): Use %' in diagnostics.
* cfgloop.c (verify_loop_structure): Use %' in diagnostics. Start
diagnostics with lowercase letters.
* cgraphunit.c (verify_cgraph_node): Start diagnostics with
lowercase letters.
* collect2.c (maybe_run_lto_and_relink): Remove trailing '.' from
diagnostic.
* config/alpha/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic.
* config/arm/arm.c (arm_get_pcs_model): Start diagnostics with
lowercase letters.
* config/arm/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic.
Remove trailing ' ' from diagnostic.
* config/avr/avr.c (print_operand_address): Start diagnostic with
a lowercase letter and remove trailing '.'.
* config/avr/avr.opt (mpmem-wrap-around): Fix typo in help text.
* config/bfin/bfin.c (bfin_option_override): Start diagnostics
with lowercase letters. Use %' in diagnostics. Remove trailing
'.' from diagnostics.
(bfin_handle_longcall_attribute): Use %' in diagnostic.
* config/cris/cris.c (cris_split_movdx,
cris_expand_pic_call_address): Start diagnostics with lowercase
letters.
(cris_asm_output_label_ref): Use %' in diagnostic.
* config/cris/cris.h (ASM_SPEC): Start diagnostic with a lowercase
letter.
* config/crx/crx.h (FUNCTION_PROFILER): Start diagnostic with a
lowercase letter.
* config/darwin-c.c (version_as_macro): Start diagnostic with a
lowercase letter.
* config/darwin-driver.c (darwin_default_min_version): Use %' in
diagnostic.
* config/host-darwin.c (darwin_gt_pch_use_address): Use %' in
diagnostic.
* config/i386/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic.
* config/i386/host-cygwin.c (cygwin_gt_pch_get_address): Use %' in
diagnostics.
* config/i386/i386.c (ix86_option_override_internal): Write
diagnostic as a single sentence without trailing '.'. Use %' in
diagnostics.
(ix86_function_sseregparm, classify_argument): Start diagnostics
with lowercase letters.
(ix86_expand_prologue): Use %' in diagnostic.
* config/i386/i386.h (CC1_CPU_SPEC_1): Remove trailing '.' from
diagnostic.
* config/i386/nwld.h (LINK_SPEC): Start diagnostic with a
lowercase letter.
* config/i386/winnt.c (i386_pe_determine_dllimport_p): Use %' in
diagnostic.
* config/ia64/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic.
* config/ia64/ia64.opt (msched-max-memory-insns-hard-limit): Avoid
'`' in help text.
* config/lm32/lm32.c (lm32_print_operand): Start diagnostic with a
lowercase letter.
* config/mep/mep.c (mep_validate_vliw): Start diagnostics with
lowercase letters.
* config/microblaze/microblaze.c (microblaze_handle_option):
Remove trailing '.' from diagnostic.
(print_operand): Start diagnostic with a lowercase letter.
* config/pa/pa-hpux10.h (LINK_SPEC): Start diagnostics with
lowercase letters. Avoid '`' in diagnostics.
* config/pa/pa-hpux11.h (LINK_SPEC): Start diagnostics with
lowercase letters. Avoid '`' in diagnostics.
* config/pa/pa64-hpux.h (LINK_SPEC): Start diagnostics with
lowercase letters. Avoid '`' in diagnostics.
* config/picochip/picochip.c (picochip_option_override,
picochip_emit_save_register, picochip_function_arg,
picochip_output_label, picochip_output_internal_label,
picochip_asm_output_opcode, picochip_output_cbranch,
picochip_output_compare, picochip_output_branch,
picochip_get_vliw_alu_id): Remove trailing '.' and '\n' from
diagnostics. Start diagnostics with lowercase letters. Use %' in
diagnostics.
* config/rs6000/rs6000.c (rs6000_option_override_internal): Use
"SPE" capitalization. Start diagnostic with a lowercase letter.
(rs6000_handle_option): Start diagnostics with lowercase letters.
(def_builtin): Remove trailing '.' from diagnostic.
(rs6000_savres_routine_name): Start diagnostic with a lowercase
letter.
* config/rs6000/sysv4.h (LINK_OS_FREEBSD_SPEC): Avoid '`' in
diagnostic.
* config/rx/rx.c (rx_handle_option): Start diagnostic with a
lowercase letter.
* config/s390/s390.c (s390_option_override) Start diagnostics with
lowercase letters. Use %' in diagnostic.
* config/sh/sh.c (sh_output_mi_thunk): Start diagnostics with
lowercase letters.
* config/sh/symbian-base.c (sh_symbian_mark_dllimport): Use %' in
diagnostic.
* config/sh/symbian-c.c (sh_symbian_is_dllimported): Use %' in
diagnostic.
* config/sh/symbian-cxx.c (sh_symbian_is_dllimported): Use %' in
diagnostic.
* config/sparc/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic.
* config/spu/spu.c (spu_option_override): Start diagnostics with
lowercase letters. Use %qs for quoting in diagnostics.
(spu_check_builtin_parm): Remove trailing '.' from diagnostics.
Use %wd instead of HOST_WIDE_INT_PRINT_DEC in diagnostic .
* config/v850/v850.c (construct_save_jarl): Remove trailing '\n'
from diagnostic.
* convert.c (convert_to_integer, convert_to_vector): Use %' in
diagnostics.
* dbgcnt.c (dbg_cnt_process_opt): Start diagnostic with lowercase
letter and use "cannot" spelling.
* expmed.c (extract_fixed_bit_field): Start diagnostic with
lowercase letter and format as a single sentence without '.'.
* ggc-common.c (write_pch_globals, gt_pch_save, gt_pch_restore):
Use %' in diagnostics.
* ggc-page.c (ggc_pch_write_object, ggc_pch_finish, ggc_pch_read):
Use %' in diagnostics.
* ggc-zone.c (ggc_pch_write_object, ggc_pch_finish, ggc_pch_read):
Use %' in diagnostics.
* graph.c (clean_graph_dump_file): Use %' in diagnostic.
* graphite-poly.c (graphite_read_scop_file): Start diagnostics
with lowercase letters and remove tailing '.' and '\n'.
* lto-cgraph.c (input_profile_summary): Start diagnostic with
lowercase letter and remove trailing '.'.
(input_cgraph): Start diagnostics with lowercase letters and
remove trailing '\n'.
* opts.c (finish_options, common_handle_option): Start diagnostics
with lowercase letters and remove trailing '.'. Fix typo in
diagnostic.
* passes.c (position_pass): Start diagnostic with lowercase
letter.
* plugin.c (add_new_plugin, parse_plugin_arg_opt,
register_callback, try_init_one_plugin): Start diagnostics with
lowercase letters.
* reload1.c (spill_failure): Use %' in diagnostic.
(gen_reload): Start diagnostic with a lowercase letter.
* stor-layout.c (place_field): Start diagnostic with a lowercase
letter.
* toplev.c (open_auxiliary_file): Use %' in diagnostic.
* tree-cfg.c (verify_expr, verify_types_in_gimple_reference,
verify_gimple_call, verify_gimple_phi, verify_eh_throw_stmt_node):
Start diagnostics with lowercase letters, remove trailing '.' and
use %' in diagnostics.
* tree-ssa.c (verify_def): Remove trailing '.' from diagnostic.
(verify_ssa): Don't split diagnostic across two error calls.
Spell out "number" and use %' in diagnostic.
* value-prof.c (visit_hist, check_counter): Start diagnostics with
lowercase letters.
c-family:
* c-common.c (handle_mode_attribute): Use %' and word "signedness"
in diagnostic.
* c-opts.c (c_common_parse_file): Start diagnostics with lowercase
letter.
* c-pragma.c (handle_pragma_target, handle_pragma_optimize):
Remove trailing '.' from diagnostics.
* c.opt (Wwrite-strings_: Avoid '`' in help text.
cp:
* cvt.c (cp_convert_to_pointer): Use %' in diagnostic.
* decl.c (layout_var_decl, maybe_commonize_var, grokdeclarator):
Use %' in diagnostics.
* decl2.c (check_classfn): Use %' in diagnostic.
* init.c (build_java_class_ref): Use %' in diagnostic.
(build_delete): Remove trailing '.' from diagnostic.
* method.c (do_build_copy_assign, walk_field_subobs): Use %' in
diagnostics.
* name-lookup.c (pushdecl_maybe_friend): Use %' in diagnostic.
* parser.c (cp_parser_exception_specification_opt): Remove
trailing '.' from diagnostic.
(cp_parser_objc_interstitial_code): Use %qs for quoting in
diagnostic.
* pt.c (check_valid_ptrmem_cst_expr): Use %< and %> for quoting in
diagnostic.
* repo.c (reopen_repo_file_for_write): Use %' in diagnostic.
fortran:
* trans-array.c (gfc_trans_deferred_array): Use "front-end"
spelling in diagnostic.
* trans.c (gfc_allocate_array_with_status): Add missing space in
diagnostic.
java:
* expr.c (expand_java_field_op): Use %' in diagnostic.
* jcf-parse.c (java_parse_file): Use %' in diagnostics.
* jvspec.c (lang_specific_driver): Use %' in diagnostic.
* lang.c (java_post_options): Use %' in diagnostics.
lto:
* lto.c (lto_resolution_read): Start diagnostics with lowercase
letters and remove trailing '.'.
(lto_file_finalize): Start diagnostic with a lowercase letter.
objc:
* objc-act.c (objc_init): Use %' in diagnostic.
(objc_set_method_opt): Remove trailing '.' from diagnostic.
From-SVN: r166570
Diffstat (limited to 'gcc')
87 files changed, 442 insertions, 242 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 185cb4026fc..03fae9f5e87 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,145 @@ +2010-11-10 Joseph Myers <joseph@codesourcery.com> + + * cfgloop.c (verify_loop_structure): Use %' in diagnostics. Start + diagnostics with lowercase letters. + * cgraphunit.c (verify_cgraph_node): Start diagnostics with + lowercase letters. + * collect2.c (maybe_run_lto_and_relink): Remove trailing '.' from + diagnostic. + * config/alpha/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic. + * config/arm/arm.c (arm_get_pcs_model): Start diagnostics with + lowercase letters. + * config/arm/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic. + Remove trailing ' ' from diagnostic. + * config/avr/avr.c (print_operand_address): Start diagnostic with + a lowercase letter and remove trailing '.'. + * config/avr/avr.opt (mpmem-wrap-around): Fix typo in help text. + * config/bfin/bfin.c (bfin_option_override): Start diagnostics + with lowercase letters. Use %' in diagnostics. Remove trailing + '.' from diagnostics. + (bfin_handle_longcall_attribute): Use %' in diagnostic. + * config/cris/cris.c (cris_split_movdx, + cris_expand_pic_call_address): Start diagnostics with lowercase + letters. + (cris_asm_output_label_ref): Use %' in diagnostic. + * config/cris/cris.h (ASM_SPEC): Start diagnostic with a lowercase + letter. + * config/crx/crx.h (FUNCTION_PROFILER): Start diagnostic with a + lowercase letter. + * config/darwin-c.c (version_as_macro): Start diagnostic with a + lowercase letter. + * config/darwin-driver.c (darwin_default_min_version): Use %' in + diagnostic. + * config/host-darwin.c (darwin_gt_pch_use_address): Use %' in + diagnostic. + * config/i386/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic. + * config/i386/host-cygwin.c (cygwin_gt_pch_get_address): Use %' in + diagnostics. + * config/i386/i386.c (ix86_option_override_internal): Write + diagnostic as a single sentence without trailing '.'. Use %' in + diagnostics. + (ix86_function_sseregparm, classify_argument): Start diagnostics + with lowercase letters. + (ix86_expand_prologue): Use %' in diagnostic. + * config/i386/i386.h (CC1_CPU_SPEC_1): Remove trailing '.' from + diagnostic. + * config/i386/nwld.h (LINK_SPEC): Start diagnostic with a + lowercase letter. + * config/i386/winnt.c (i386_pe_determine_dllimport_p): Use %' in + diagnostic. + * config/ia64/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic. + * config/ia64/ia64.opt (msched-max-memory-insns-hard-limit): Avoid + '`' in help text. + * config/lm32/lm32.c (lm32_print_operand): Start diagnostic with a + lowercase letter. + * config/mep/mep.c (mep_validate_vliw): Start diagnostics with + lowercase letters. + * config/microblaze/microblaze.c (microblaze_handle_option): + Remove trailing '.' from diagnostic. + (print_operand): Start diagnostic with a lowercase letter. + * config/pa/pa-hpux10.h (LINK_SPEC): Start diagnostics with + lowercase letters. Avoid '`' in diagnostics. + * config/pa/pa-hpux11.h (LINK_SPEC): Start diagnostics with + lowercase letters. Avoid '`' in diagnostics. + * config/pa/pa64-hpux.h (LINK_SPEC): Start diagnostics with + lowercase letters. Avoid '`' in diagnostics. + * config/picochip/picochip.c (picochip_option_override, + picochip_emit_save_register, picochip_function_arg, + picochip_output_label, picochip_output_internal_label, + picochip_asm_output_opcode, picochip_output_cbranch, + picochip_output_compare, picochip_output_branch, + picochip_get_vliw_alu_id): Remove trailing '.' and '\n' from + diagnostics. Start diagnostics with lowercase letters. Use %' in + diagnostics. + * config/rs6000/rs6000.c (rs6000_option_override_internal): Use + "SPE" capitalization. Start diagnostic with a lowercase letter. + (rs6000_handle_option): Start diagnostics with lowercase letters. + (def_builtin): Remove trailing '.' from diagnostic. + (rs6000_savres_routine_name): Start diagnostic with a lowercase + letter. + * config/rs6000/sysv4.h (LINK_OS_FREEBSD_SPEC): Avoid '`' in + diagnostic. + * config/rx/rx.c (rx_handle_option): Start diagnostic with a + lowercase letter. + * config/s390/s390.c (s390_option_override) Start diagnostics with + lowercase letters. Use %' in diagnostic. + * config/sh/sh.c (sh_output_mi_thunk): Start diagnostics with + lowercase letters. + * config/sh/symbian-base.c (sh_symbian_mark_dllimport): Use %' in + diagnostic. + * config/sh/symbian-c.c (sh_symbian_is_dllimported): Use %' in + diagnostic. + * config/sh/symbian-cxx.c (sh_symbian_is_dllimported): Use %' in + diagnostic. + * config/sparc/freebsd.h (LINK_SPEC): Avoid '`' in diagnostic. + * config/spu/spu.c (spu_option_override): Start diagnostics with + lowercase letters. Use %qs for quoting in diagnostics. + (spu_check_builtin_parm): Remove trailing '.' from diagnostics. + Use %wd instead of HOST_WIDE_INT_PRINT_DEC in diagnostic . + * config/v850/v850.c (construct_save_jarl): Remove trailing '\n' + from diagnostic. + * convert.c (convert_to_integer, convert_to_vector): Use %' in + diagnostics. + * dbgcnt.c (dbg_cnt_process_opt): Start diagnostic with lowercase + letter and use "cannot" spelling. + * expmed.c (extract_fixed_bit_field): Start diagnostic with + lowercase letter and format as a single sentence without '.'. + * ggc-common.c (write_pch_globals, gt_pch_save, gt_pch_restore): + Use %' in diagnostics. + * ggc-page.c (ggc_pch_write_object, ggc_pch_finish, ggc_pch_read): + Use %' in diagnostics. + * ggc-zone.c (ggc_pch_write_object, ggc_pch_finish, ggc_pch_read): + Use %' in diagnostics. + * graph.c (clean_graph_dump_file): Use %' in diagnostic. + * graphite-poly.c (graphite_read_scop_file): Start diagnostics + with lowercase letters and remove tailing '.' and '\n'. + * lto-cgraph.c (input_profile_summary): Start diagnostic with + lowercase letter and remove trailing '.'. + (input_cgraph): Start diagnostics with lowercase letters and + remove trailing '\n'. + * opts.c (finish_options, common_handle_option): Start diagnostics + with lowercase letters and remove trailing '.'. Fix typo in + diagnostic. + * passes.c (position_pass): Start diagnostic with lowercase + letter. + * plugin.c (add_new_plugin, parse_plugin_arg_opt, + register_callback, try_init_one_plugin): Start diagnostics with + lowercase letters. + * reload1.c (spill_failure): Use %' in diagnostic. + (gen_reload): Start diagnostic with a lowercase letter. + * stor-layout.c (place_field): Start diagnostic with a lowercase + letter. + * toplev.c (open_auxiliary_file): Use %' in diagnostic. + * tree-cfg.c (verify_expr, verify_types_in_gimple_reference, + verify_gimple_call, verify_gimple_phi, verify_eh_throw_stmt_node): + Start diagnostics with lowercase letters, remove trailing '.' and + use %' in diagnostics. + * tree-ssa.c (verify_def): Remove trailing '.' from diagnostic. + (verify_ssa): Don't split diagnostic across two error calls. + Spell out "number" and use %' in diagnostic. + * value-prof.c (visit_hist, check_counter): Start diagnostics with + lowercase letters. + 2010-11-10 Uros Bizjak <ubizjak@gmail.com> PR middle-end/46419 diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index aa5539f9526..80a10a3ea36 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,5 +1,15 @@ 2010-11-10 Joseph Myers <joseph@codesourcery.com> + * c-common.c (handle_mode_attribute): Use %' and word "signedness" + in diagnostic. + * c-opts.c (c_common_parse_file): Start diagnostics with lowercase + letter. + * c-pragma.c (handle_pragma_target, handle_pragma_optimize): + Remove trailing '.' from diagnostics. + * c.opt (Wwrite-strings_: Avoid '`' in help text. + +2010-11-10 Joseph Myers <joseph@codesourcery.com> + * c-common.c (parse_optimize_options): Pass global_dc to decode_options. * c-opts.c (c_common_handle_option): Pass &global_options to diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index d4b5da1128a..154b6c94a76 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -6408,7 +6408,7 @@ handle_mode_attribute (tree *node, tree name, tree args, if (ALL_FIXED_POINT_MODE_P (mode) && TYPE_UNSIGNED (type) != UNSIGNED_FIXED_POINT_MODE_P (mode)) { - error ("signness of type and machine mode %qs don't match", p); + error ("signedness of type and machine mode %qs don%'t match", p); return NULL_TREE; } /* For fixed-point modes, we need to pass saturating info. */ diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index dc5c777d3e9..b4b77796696 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -1136,18 +1136,18 @@ c_common_parse_file (int set_yydebug) switch (c_language) { case clk_c: - warning(0, "The C parser does not support -dy, option ignored"); + warning(0, "the C parser does not support -dy, option ignored"); break; case clk_objc: warning(0, - "The Objective-C parser does not support -dy, option ignored"); + "the Objective-C parser does not support -dy, option ignored"); break; case clk_cxx: - warning(0, "The C++ parser does not support -dy, option ignored"); + warning(0, "the C++ parser does not support -dy, option ignored"); break; case clk_objcxx: warning(0, - "The Objective-C++ parser does not support -dy, option ignored"); + "the Objective-C++ parser does not support -dy, option ignored"); break; default: gcc_unreachable (); diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index 5aa209c8e64..23be17922c1 100644 --- a/gcc/c-family/c-pragma.c +++ b/gcc/c-family/c-pragma.c @@ -816,7 +816,7 @@ handle_pragma_target(cpp_reader *ARG_UNUSED(dummy)) token = pragma_lex (&x); else GCC_BAD ("%<#pragma GCC target (string [,string]...)%> does " - "not have a final %<)%>."); + "not have a final %<)%>"); } if (token != CPP_EOF) @@ -884,7 +884,7 @@ handle_pragma_optimize (cpp_reader *ARG_UNUSED(dummy)) token = pragma_lex (&x); else GCC_BAD ("%<#pragma GCC optimize (string [,string]...)%> does " - "not have a final %<)%>."); + "not have a final %<)%>"); } if (token != CPP_EOF) diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index b25ecd6789a..868247168fe 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -667,7 +667,7 @@ Warn when a register variable is declared volatile Wwrite-strings C ObjC C++ ObjC++ Var(warn_write_strings) Warning -In C++, nonzero means warn about deprecated conversion from string literals to `char *'. In C, similar warning, except that the conversion is of course not deprecated by the ISO C standard. +In C++, nonzero means warn about deprecated conversion from string literals to 'char *'. In C, similar warning, except that the conversion is of course not deprecated by the ISO C standard. Wpointer-sign C ObjC Var(warn_pointer_sign) Init(-1) Warning diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c index 22bce4f3190..08d689d2327 100644 --- a/gcc/cfgloop.c +++ b/gcc/cfgloop.c @@ -1360,36 +1360,36 @@ verify_loop_structure (void) if (loops_state_satisfies_p (LOOPS_HAVE_PREHEADERS) && EDGE_COUNT (loop->header->preds) != 2) { - error ("loop %d's header does not have exactly 2 entries", i); + error ("loop %d%'s header does not have exactly 2 entries", i); err = 1; } if (loops_state_satisfies_p (LOOPS_HAVE_SIMPLE_LATCHES)) { if (!single_succ_p (loop->latch)) { - error ("loop %d's latch does not have exactly 1 successor", i); + error ("loop %d%'s latch does not have exactly 1 successor", i); err = 1; } if (single_succ (loop->latch) != loop->header) { - error ("loop %d's latch does not have header as successor", i); + error ("loop %d%'s latch does not have header as successor", i); err = 1; } if (loop->latch->loop_father != loop) { - error ("loop %d's latch does not belong directly to it", i); + error ("loop %d%'s latch does not belong directly to it", i); err = 1; } } if (loop->header->loop_father != loop) { - error ("loop %d's header does not belong directly to it", i); + error ("loop %d%'s header does not belong directly to it", i); err = 1; } if (loops_state_satisfies_p (LOOPS_HAVE_MARKED_IRREDUCIBLE_REGIONS) && (loop_latch_edge (loop)->flags & EDGE_IRREDUCIBLE_LOOP)) { - error ("loop %d's latch is marked as part of irreducible region", i); + error ("loop %d%'s latch is marked as part of irreducible region", i); err = 1; } } @@ -1511,7 +1511,7 @@ verify_loop_structure (void) exit = get_exit_descriptions (e); if (!exit) { - error ("Exit %d->%d not recorded", + error ("exit %d->%d not recorded", e->src->index, e->dest->index); err = 1; } @@ -1529,7 +1529,7 @@ verify_loop_structure (void) if (eloops != 0) { - error ("Wrong list of exited loops for edge %d->%d", + error ("wrong list of exited loops for edge %d->%d", e->src->index, e->dest->index); err = 1; } @@ -1538,7 +1538,7 @@ verify_loop_structure (void) if (n_exits != htab_elements (current_loops->exits)) { - error ("Too many loop exits recorded"); + error ("too many loop exits recorded"); err = 1; } diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index ed86a029690..c2d2fed9b1d 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -468,22 +468,22 @@ verify_cgraph_node (struct cgraph_node *node) } if (node->count < 0) { - error ("Execution count is negative"); + error ("execution count is negative"); error_found = true; } if (node->global.inlined_to && node->local.externally_visible) { - error ("Externally visible inline clone"); + error ("externally visible inline clone"); error_found = true; } if (node->global.inlined_to && node->address_taken) { - error ("Inline clone with address taken"); + error ("inline clone with address taken"); error_found = true; } if (node->global.inlined_to && node->needed) { - error ("Inline clone is needed"); + error ("inline clone is needed"); error_found = true; } for (e = node->indirect_calls; e; e = e->next_callee) diff --git a/gcc/collect2.c b/gcc/collect2.c index 465a98aea1a..37a535ba1a4 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -954,7 +954,7 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst, size_t num_files; if (!lto_wrapper) - fatal ("COLLECT_LTO_WRAPPER must be set."); + fatal ("COLLECT_LTO_WRAPPER must be set"); num_lto_c_args++; diff --git a/gcc/config/alpha/freebsd.h b/gcc/config/alpha/freebsd.h index 9a52fe4a42a..d100bba7860 100644 --- a/gcc/config/alpha/freebsd.h +++ b/gcc/config/alpha/freebsd.h @@ -1,5 +1,6 @@ /* Definitions for DEC Alpha/AXP running FreeBSD using the ELF format - Copyright (C) 2000, 2002, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2004, 2005, 2007, 2010 + Free Software Foundation, Inc. Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi. This file is part of GCC. @@ -30,7 +31,7 @@ along with GCC; see the file COPYING3. If not see #define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" #define LINK_SPEC "%{G*} %{relax:-relax} \ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{Wl,*:%*} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a246d5b64d9..5baa2ca8476 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3797,9 +3797,9 @@ arm_get_pcs_model (const_tree type, const_tree decl) if (user_convention) { if (user_pcs > ARM_PCS_AAPCS_LOCAL) - sorry ("Non-AAPCS derived PCS variant"); + sorry ("non-AAPCS derived PCS variant"); else if (base_rules && user_pcs != ARM_PCS_AAPCS) - error ("Variadic functions must use the base AAPCS variant"); + error ("variadic functions must use the base AAPCS variant"); } if (base_rules) diff --git a/gcc/config/arm/freebsd.h b/gcc/config/arm/freebsd.h index 6e59cff0543..20cda99defb 100644 --- a/gcc/config/arm/freebsd.h +++ b/gcc/config/arm/freebsd.h @@ -1,5 +1,5 @@ /* Definitions for StrongARM running FreeBSD using the ELF format - Copyright (C) 2001, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2001, 2004, 2007, 2010 Free Software Foundation, Inc. Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi. This file is part of GCC. @@ -28,7 +28,7 @@ #undef LINK_SPEC #define LINK_SPEC " \ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1) } \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 7016d483501..2af5cbf92c5 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -1166,7 +1166,7 @@ print_operand_address (FILE *file, rtx addr) output_addr_const (file, XEXP (x,0)); fprintf (file,"+" HOST_WIDE_INT_PRINT_DEC ")", 2 * INTVAL (XEXP (x,1))); if (AVR_3_BYTE_PC) - if (warning ( 0, "Pointer offset from symbol maybe incorrect.")) + if (warning (0, "pointer offset from symbol maybe incorrect")) { output_addr_const (stderr, addr); fprintf(stderr,"\n"); diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt index f8013e53a18..62fc1f126a5 100644 --- a/gcc/config/avr/avr.opt +++ b/gcc/config/avr/avr.opt @@ -57,4 +57,4 @@ Relax branches mpmem-wrap-around Target Report -Make the linker relaxation machine assume that a program counter wrap-around occures. +Make the linker relaxation machine assume that a program counter wrap-around occurs. diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c index 1ef311b625b..851a38ba315 100644 --- a/gcc/config/bfin/bfin.c +++ b/gcc/config/bfin/bfin.c @@ -2696,10 +2696,10 @@ bfin_option_override (void) error ("-mshared-library-id= specified without -mid-shared-library"); if (stack_limit_rtx && TARGET_STACK_CHECK_L1) - error ("Can't use multiple stack checking methods together."); + error ("can%'t use multiple stack checking methods together"); if (TARGET_ID_SHARED_LIBRARY && TARGET_FDPIC) - error ("ID shared libraries and FD-PIC mode can't be used together."); + error ("ID shared libraries and FD-PIC mode can%'t be used together"); /* Don't allow the user to specify -mid-shared-library and -msep-data together, as it makes little sense from a user's point of view... */ @@ -2733,7 +2733,7 @@ bfin_option_override (void) error ("-mcoreb should be used with -mmulticore"); if (TARGET_COREA && TARGET_COREB) - error ("-mcorea and -mcoreb can't be used together"); + error ("-mcorea and -mcoreb can%'t be used together"); flag_schedule_insns = 0; @@ -5639,7 +5639,7 @@ bfin_handle_longcall_attribute (tree *node, tree name, && lookup_attribute ("longcall", TYPE_ATTRIBUTES (*node)))) { warning (OPT_Wattributes, - "can't apply both longcall and shortcall attributes to the same function"); + "can%'t apply both longcall and shortcall attributes to the same function"); *no_add_attrs = true; } diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index fd5e0958ac5..0681f8d994e 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -2779,7 +2779,7 @@ cris_split_movdx (rtx *operands) } } else - internal_error ("Unknown src"); + internal_error ("unknown src"); } /* Reg-to-mem copy or clear mem. */ else if (MEM_P (dest) @@ -2840,7 +2840,7 @@ cris_split_movdx (rtx *operands) } else - internal_error ("Unknown dest"); + internal_error ("unknown dest"); val = get_insns (); end_sequence (); @@ -3660,7 +3660,7 @@ cris_expand_pic_call_address (rtx *opp) else /* Can't possibly get a GOT-needing-fixup for a function-call, right? */ - fatal_insn ("Unidentifiable call op", op); + fatal_insn ("unidentifiable call op", op); *opp = replace_equiv_address (*opp, op); } @@ -3729,7 +3729,8 @@ cris_asm_output_label_ref (FILE *file, char *buf) /* Sanity check. */ if (!TARGET_V32 && !crtl->uses_pic_offset_table) - internal_error ("emitting PIC operand, but PIC register isn't set up"); + internal_error ("emitting PIC operand, but PIC register " + "isn%'t set up"); } else assemble_name (file, buf); diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index a7b7e4d1e62..943b0021608 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -194,7 +194,7 @@ extern int cris_cpu_version; MAYBE_AS_NO_MUL_BUG_ABORT \ "%{v:-v}\ %(asm_subtarget)\ - %{march=*:%{cpu=*:%eDo not specify both -march=... and -mcpu=...}}\ + %{march=*:%{cpu=*:%edo not specify both -march=... and -mcpu=...}}\ %{march=v32:--march=v32} %{mcpu=v32:--march=v32}" /* For the cris-*-elf subtarget. */ diff --git a/gcc/config/crx/crx.h b/gcc/config/crx/crx.h index eac1594c036..da6e263ca52 100644 --- a/gcc/config/crx/crx.h +++ b/gcc/config/crx/crx.h @@ -339,7 +339,7 @@ struct cumulative_args #undef FUNCTION_PROFILER #define FUNCTION_PROFILER(STREAM, LABELNO) \ { \ - sorry ("Profiler support for CRX"); \ + sorry ("profiler support for CRX"); \ } /*****************************************************************************/ diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index 99b6db1637d..973f8f22a5d 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -590,7 +590,7 @@ version_as_macro (void) return result; fail: - error ("Unknown value %qs of -mmacosx-version-min", + error ("unknown value %qs of -mmacosx-version-min", darwin_macosx_version_min); return "1000"; } diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c index bf27336ce29..1eb92010637 100644 --- a/gcc/config/darwin-driver.c +++ b/gcc/config/darwin-driver.c @@ -133,7 +133,7 @@ darwin_default_min_version (unsigned int *decoded_options_count, return; parse_failed: - warning (0, "couldn't understand kern.osversion %q.*s", + warning (0, "couldn%'t understand kern.osversion %q.*s", (int) osversion_len, osversion); return; } diff --git a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c index 6c94140a891..223abb89968 100644 --- a/gcc/config/host-darwin.c +++ b/gcc/config/host-darwin.c @@ -60,7 +60,7 @@ darwin_gt_pch_use_address (void *addr, size_t sz, int fd, size_t off) sz = (sz + pagesize - 1) / pagesize * pagesize; if (munmap (pch_address_space + sz, sizeof (pch_address_space) - sz) != 0) - fatal_error ("couldn't unmap pch_address_space: %m"); + fatal_error ("couldn%'t unmap pch_address_space: %m"); if (ret) { diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h index 1ec5ee0d27d..1d27044018a 100644 --- a/gcc/config/i386/freebsd.h +++ b/gcc/config/i386/freebsd.h @@ -1,5 +1,6 @@ /* Definitions for Intel 386 running FreeBSD with ELF format - Copyright (C) 1996, 2000, 2002, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002, 2004, 2007, 2010 + Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -100,7 +101,7 @@ along with GCC; see the file COPYING3. If not see #undef LINK_SPEC #define LINK_SPEC "\ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ diff --git a/gcc/config/i386/host-cygwin.c b/gcc/config/i386/host-cygwin.c index 1f831a6d461..ac699b3bf01 100644 --- a/gcc/config/i386/host-cygwin.c +++ b/gcc/config/i386/host-cygwin.c @@ -54,14 +54,14 @@ cygwin_gt_pch_get_address (size_t sz, int fd) off_t p = lseek(fd, 0, SEEK_CUR); if (p == (off_t) -1) - fatal_error ("can't get position in PCH file: %m"); + fatal_error ("can%'t get position in PCH file: %m"); /* Cygwin requires that the underlying file be at least as large as the requested mapping. */ if ((size_t) p < sz) { if ( ftruncate (fd, sz) == -1 ) - fatal_error ("can't extend PCH file: %m"); + fatal_error ("can%'t extend PCH file: %m"); } base = mmap (NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); @@ -72,7 +72,7 @@ cygwin_gt_pch_get_address (size_t sz, int fd) munmap (base, sz); if (lseek (fd, p, SEEK_SET) == (off_t) -1 ) - fatal_error ("can't set position in PCH file: %m"); + fatal_error ("can%'t set position in PCH file: %m"); return base; } diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index d52a0a45de7..96327854638 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -3296,8 +3296,8 @@ ix86_option_override_internal (bool main_args_p) error ("bad value (%s) for %stune=%s %s", ix86_tune_string, prefix, suffix, sw); else if (!strcmp (ix86_tune_string, "x86-64")) - warning (OPT_Wdeprecated, "%stune=x86-64%s is deprecated. Use " - "%stune=k8%s or %stune=generic%s instead as appropriate.", + warning (OPT_Wdeprecated, "%stune=x86-64%s is deprecated; use " + "%stune=k8%s or %stune=generic%s instead as appropriate", prefix, suffix, prefix, suffix, prefix, suffix); } else @@ -4023,13 +4023,14 @@ ix86_option_override_internal (bool main_args_p) if (!TARGET_64BIT && flag_pic) { if (flag_fentry > 0) - sorry ("-mfentry isn't supported for 32-bit in combination with -fpic"); + sorry ("-mfentry isn%'t supported for 32-bit in combination " + "with -fpic"); flag_fentry = 0; } else if (TARGET_SEH) { if (flag_fentry == 0) - sorry ("-mno-fentry isn't compatible with SEH"); + sorry ("-mno-fentry isn%'t compatible with SEH"); flag_fentry = 1; } else if (flag_fentry < 0) @@ -5337,10 +5338,10 @@ ix86_function_sseregparm (const_tree type, const_tree decl, bool warn) if (warn) { if (decl) - error ("Calling %qD with attribute sseregparm without " + error ("calling %qD with attribute sseregparm without " "SSE/SSE2 enabled", decl); else - error ("Calling %qT with attribute sseregparm without " + error ("calling %qT with attribute sseregparm without " "SSE/SSE2 enabled", type); } return 0; @@ -6002,7 +6003,7 @@ classify_argument (enum machine_mode mode, const_tree type, { warned = true; inform (input_location, - "The ABI of passing struct with" + "the ABI of passing struct with" " a flexible array member has" " changed in GCC 4.4"); } @@ -6118,7 +6119,7 @@ classify_argument (enum machine_mode mode, const_tree type, { warned = true; inform (input_location, - "The ABI of passing union with long double" + "the ABI of passing union with long double" " has changed in GCC 4.4"); } return 0; @@ -6233,7 +6234,7 @@ classify_argument (enum machine_mode mode, const_tree type, { warned = true; inform (input_location, - "The ABI of passing structure with complex float" + "the ABI of passing structure with complex float" " member has changed in GCC 4.4"); } classes[1] = X86_64_SSESF_CLASS; @@ -10086,7 +10087,7 @@ ix86_expand_prologue (void) /* Check if profiling is active and we shall use profiling before prologue variant. If so sorry. */ if (crtl->profile && flag_fentry != 0) - sorry ("ms_hook_prologue attribute isn't compatible " + sorry ("ms_hook_prologue attribute isn%'t compatible " "with -mfentry for 32-bit"); /* In ix86_asm_output_function_label we emitted: diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 8ef0d7b4d6b..1bc52068d89 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -552,7 +552,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); #ifndef CC1_CPU_SPEC #define CC1_CPU_SPEC_1 "\ %{msse5:-mavx \ -%n'-msse5' was removed.\n}" +%n'-msse5' was removed\n}" #ifndef HAVE_LOCAL_CPU_DETECT #define CC1_CPU_SPEC CC1_CPU_SPEC_1 diff --git a/gcc/config/i386/nwld.h b/gcc/config/i386/nwld.h index 3a0afc8b63d..94ef0556ff2 100644 --- a/gcc/config/i386/nwld.h +++ b/gcc/config/i386/nwld.h @@ -31,7 +31,7 @@ along with GCC; see the file COPYING3. If not see #undef LINK_SPEC #define LINK_SPEC "--format:NLM --extensions:GNU" \ - " %{static:%{!nostdlib:%{!nodefaultlib:%eStatic linking is not supported.\n}}}" + " %{static:%{!nostdlib:%{!nodefaultlib:%estatic linking is not supported\n}}}" #undef LINK_GCC_C_SEQUENCE_SPEC #define LINK_GCC_C_SEQUENCE_SPEC "%L %G" diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index 251bb5ae5bc..b8d2979c465 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -144,7 +144,7 @@ i386_pe_determine_dllimport_p (tree decl) an error as long as we don't try to import it too. */ && !DECL_VIRTUAL_P (decl)) error ("definition of static data member %q+D of " - "dllimport'd class", decl); + "dllimport%'d class", decl); return false; } diff --git a/gcc/config/ia64/freebsd.h b/gcc/config/ia64/freebsd.h index 94a6c935f56..7881ab17b4c 100644 --- a/gcc/config/ia64/freebsd.h +++ b/gcc/config/ia64/freebsd.h @@ -1,5 +1,5 @@ /* Definitions for Intel IA-64 running FreeBSD using the ELF format - Copyright (C) 2001, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2001, 2004, 2007, 2010 Free Software Foundation, Inc. Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi. This file is part of GCC. @@ -23,7 +23,7 @@ along with GCC; see the file COPYING3. If not see { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } #define LINK_SPEC " \ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ %{symbolic:-Bsymbolic} \ diff --git a/gcc/config/ia64/ia64.opt b/gcc/config/ia64/ia64.opt index 27cd5b1eaeb..70821ceee1c 100644 --- a/gcc/config/ia64/ia64.opt +++ b/gcc/config/ia64/ia64.opt @@ -1,4 +1,4 @@ -; Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. +; Copyright (C) 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. ; ; This file is part of GCC. ; @@ -172,7 +172,7 @@ Soft limit on number of memory insns per instruction group, giving lower priorit msched-max-memory-insns-hard-limit Target Report Var(mflag_sched_mem_insns_hard_limit) Init(0) -Disallow more than `msched-max-memory-insns' in instruction group. Otherwise, limit is `soft' (prefer non-memory operations when limit is reached) +Disallow more than 'msched-max-memory-insns' in instruction group. Otherwise, limit is 'soft' (prefer non-memory operations when limit is reached) msel-sched-dont-check-control-spec Target Report Var(mflag_sel_sched_dont_check_control_spec) Init(0) diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c index ef09377626d..b155697b97f 100644 --- a/gcc/config/lm32/lm32.c +++ b/gcc/config/lm32/lm32.c @@ -523,7 +523,7 @@ lm32_print_operand (FILE * file, rtx op, int letter) else if (GET_CODE (op) == CONST_DOUBLE) { if ((CONST_DOUBLE_LOW (op) != 0) || (CONST_DOUBLE_HIGH (op) != 0)) - output_operand_lossage ("Only 0.0 can be loaded as an immediate"); + output_operand_lossage ("only 0.0 can be loaded as an immediate"); else fprintf (file, "0"); } diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c index c55624b2eb1..62877d4754c 100644 --- a/gcc/config/mep/mep.c +++ b/gcc/config/mep/mep.c @@ -4066,7 +4066,7 @@ mep_validate_vliw (tree *node, tree name, tree args ATTRIBUTE_UNUSED, if (TREE_CODE (*node) == POINTER_TYPE && !gave_pointer_note) { - inform (input_location, "To describe a pointer to a VLIW function, use syntax like this:"); + inform (input_location, "to describe a pointer to a VLIW function, use syntax like this:"); inform (input_location, " typedef int (__vliw *vfuncptr) ();"); gave_pointer_note = 1; } @@ -4074,7 +4074,7 @@ mep_validate_vliw (tree *node, tree name, tree args ATTRIBUTE_UNUSED, if (TREE_CODE (*node) == ARRAY_TYPE && !gave_array_note) { - inform (input_location, "To describe an array of VLIW function pointers, use syntax like this:"); + inform (input_location, "to describe an array of VLIW function pointers, use syntax like this:"); inform (input_location, " typedef int (__vliw *vfuncptr[]) ();"); gave_array_note = 1; } diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c index bcf845bed67..e81285c9067 100644 --- a/gcc/config/microblaze/microblaze.c +++ b/gcc/config/microblaze/microblaze.c @@ -1285,7 +1285,7 @@ microblaze_handle_option (size_t code, warning (0, "-mno-clearbss is deprecated; use -fno-zero-initialized-in-bss"); break; case OPT_mxl_stack_check: - warning (0, "-mxl_stack_check is deprecated; use -fstack-check."); + warning (0, "-mxl_stack_check is deprecated; use -fstack-check"); break; } return true; @@ -1845,7 +1845,7 @@ print_operand (FILE * file, rtx op, int letter) break; case ADDRESS_INVALID: case ADDRESS_PLT: - fatal_insn ("Invalid address", op); + fatal_insn ("invalid address", op); } } } diff --git a/gcc/config/pa/pa-hpux10.h b/gcc/config/pa/pa-hpux10.h index 4fe03f6dd8d..9a02eeacab6 100644 --- a/gcc/config/pa/pa-hpux10.h +++ b/gcc/config/pa/pa-hpux10.h @@ -84,10 +84,10 @@ along with GCC; see the file COPYING3. If not see #define LINK_SPEC \ "%{!mpa-risc-1-0:%{!march=1.0:%{static:-L/lib/pa1.1 -L/usr/lib/pa1.1 }}}\ %{!shared:%{p:-L/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{pg:-L/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{!static:%{rdynamic:-E}}}\ -z %{mlinker-opt:-O} %{!shared:-u main}\ @@ -95,10 +95,10 @@ along with GCC; see the file COPYING3. If not see #else #define LINK_SPEC \ "%{!shared:%{p:-L/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{pg:-L/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{!static:%{rdynamic:-E}}}\ -z %{mlinker-opt:-O} %{!shared:-u main}\ diff --git a/gcc/config/pa/pa-hpux11.h b/gcc/config/pa/pa-hpux11.h index dd9f9b56592..e9aa0f90ac5 100644 --- a/gcc/config/pa/pa-hpux11.h +++ b/gcc/config/pa/pa-hpux11.h @@ -105,10 +105,10 @@ along with GCC; see the file COPYING3. If not see #undef LINK_SPEC #define LINK_SPEC \ "%{!shared:%{p:-L/lib/libp -L/usr/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{pg:-L/lib/libp -L/usr/lib/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{!static:%{rdynamic:-E}}}\ -z %{mlinker-opt:-O} %{!shared:-u main -u __gcc_plt_call}\ diff --git a/gcc/config/pa/pa64-hpux.h b/gcc/config/pa/pa64-hpux.h index 5132b2fe5e4..5c1bd02c012 100644 --- a/gcc/config/pa/pa64-hpux.h +++ b/gcc/config/pa/pa64-hpux.h @@ -27,10 +27,10 @@ along with GCC; see the file COPYING3. If not see #if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_GNU_LD) #define LINK_SPEC \ "%{!shared:%{p:-L/lib/pa20_64/libp -L/usr/lib/pa20_64/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{pg:-L/lib/pa20_64/libp -L/usr/lib/pa20_64/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{!static:%{rdynamic:-E}}}\ %{mhp-ld:+Accept TypeMismatch -z} %{mlinker-opt:-O}\ @@ -39,10 +39,10 @@ along with GCC; see the file COPYING3. If not see #else #define LINK_SPEC \ "%{!shared:%{p:-L/lib/pa20_64/libp -L/usr/lib/pa20_64/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{pg:-L/lib/pa20_64/libp -L/usr/lib/pa20_64/libp %{!static:\ - %nWarning: consider linking with `-static' as system libraries with\n\ + %nwarning: consider linking with '-static' as system libraries with\n\ %n profiling support are only provided in archive format}}}\ %{!shared:%{!static:%{rdynamic:-E}}}\ %{!mgnu-ld:+Accept TypeMismatch -z} %{mlinker-opt:-O}\ diff --git a/gcc/config/picochip/picochip.c b/gcc/config/picochip/picochip.c index 2e82247ad2e..d2dab017d8a 100644 --- a/gcc/config/picochip/picochip.c +++ b/gcc/config/picochip/picochip.c @@ -431,7 +431,7 @@ picochip_option_override (void) unit ISA options. Any unrecognised AE types will end up being passed to the compiler, which should reject them as invalid. */ if (picochip_ae_type_string != NULL) - error ("invalid AE type specified (%s)\n", picochip_ae_type_string); + error ("invalid AE type specified (%s)", picochip_ae_type_string); /* Override any specific capabilities of the instruction set. These take precedence over any capabilities inferred from the AE type, @@ -454,7 +454,7 @@ picochip_option_override (void) else if (strcmp (picochip_mul_type_string, "none") == 0) { /* Do nothing. Unit types already set to false. */ } else - error ("Invalid mul type specified (%s) - expected mac, mul or none", + error ("invalid mul type specified (%s) - expected mac, mul or none", picochip_mul_type_string); } @@ -749,7 +749,7 @@ picochip_emit_save_register (rtx reg, int offset) default: internal_error - ("unexpected mode %s encountered in picochip_emit_save_register\n", + ("unexpected mode %s encountered in picochip_emit_save_register", GET_MODE_NAME (GET_MODE (reg))); } @@ -916,7 +916,7 @@ picochip_function_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode, default: warning - (0, "Defaulting to stack for %s register creation\n", + (0, "defaulting to stack for %s register creation", GET_MODE_NAME (mode)); break; } @@ -1599,7 +1599,7 @@ picochip_output_label (FILE * stream, const char name[]) { if (picochip_current_vliw_state.num_cfi_labels_deferred == 2) { - internal_error ("LCFI labels have already been deferred."); + internal_error ("LCFI labels have already been deferred"); } strcpy (picochip_current_vliw_state.cfi_label_name[ picochip_current_vliw_state.num_cfi_labels_deferred], name); @@ -1662,7 +1662,7 @@ picochip_output_internal_label (FILE * stream, const char *prefix, (strcmp (prefix, "LM")) == 0 && picochip_vliw_continuation) { if (strlen (picochip_current_vliw_state.lm_label_name) != 0) - internal_error ("LM label has already been deferred."); + internal_error ("LM label has already been deferred"); sprintf (picochip_current_vliw_state.lm_label_name, "picoMark_%s%ld", prefix, num); @@ -1954,7 +1954,7 @@ picochip_asm_output_opcode (FILE * f, const char *ptr) made to pack it into a VLIW. */ if (strchr (ptr, '\n') != NULL && picochip_vliw_continuation) internal_error - ("picochip_asm_output_opcode - Found multiple lines in VLIW packet %s\n", + ("picochip_asm_output_opcode - Found multiple lines in VLIW packet %s", ptr); @@ -2057,7 +2057,7 @@ picochip_asm_output_opcode (FILE * f, const char *ptr) } else if (c == '%') internal_error - ("picochip_asm_output_opcode - can't output unknown operator %c\n", + ("picochip_asm_output_opcode - can%'t output unknown operator %c", *ptr); else fputc (c, f); @@ -2308,7 +2308,7 @@ picochip_output_cbranch (rtx operands[]) (HImode != GET_MODE (operands[2]) && GET_CODE (operands[2]) != CONST_INT)) { - internal_error ("%s: At least one operand can't be handled", + internal_error ("%s: at least one operand can%'t be handled", __FUNCTION__); } @@ -2368,7 +2368,7 @@ picochip_output_compare (rtx operands[]) (HImode != GET_MODE (operands[2]) && GET_CODE (operands[2]) != CONST_INT)) { - internal_error ("%s: At least one operand can't be handled", + internal_error ("%s: at least one operand can%'t be handled", __FUNCTION__); } @@ -2449,7 +2449,7 @@ picochip_output_branch (rtx operands[], rtx insn) case GTU: return ("BLO %l0 %>"); default: - internal_error ("Unknown short branch in %s (type %d)\n", + internal_error ("unknown short branch in %s (type %d)", __FUNCTION__, (int) INTVAL (operands[1])); return "UNKNOWN_BRANCH"; } @@ -2486,7 +2486,7 @@ picochip_output_branch (rtx operands[], rtx insn) return ("JMPLO %l0 %>"); default: - internal_error ("Unknown long branch in %s (type %d)\n", + internal_error ("unknown long branch in %s (type %d)", __FUNCTION__, (int) INTVAL (operands[1])); return "UNKNOWN_BRANCH"; } @@ -3431,7 +3431,7 @@ picochip_get_vliw_alu_id (void) return '1'; default: - internal_error ("Too many ALU instructions emitted (%d)\n", + internal_error ("too many ALU instructions emitted (%d)", picochip_current_vliw_state.num_alu_insns_so_far); return 'X'; } diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index e441c70bd9b..ba85c0a9a51 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -2662,7 +2662,7 @@ rs6000_option_override_internal (const char *default_cpu) if (TARGET_ALTIVEC) error ("AltiVec not supported in this target"); if (TARGET_SPE) - error ("Spe not supported in this target"); + error ("SPE not supported in this target"); } /* Disable Cell microcode if we are optimizing for the Cell @@ -3250,7 +3250,7 @@ rs6000_option_override_internal (const char *default_cpu) if (i == ARRAY_SIZE (recip_options)) { - error ("Unknown option for -mrecip=%s", q); + error ("unknown option for -mrecip=%s", q); invert = false; mask = 0; } @@ -4317,25 +4317,25 @@ rs6000_handle_option (size_t code, const char *arg, int value) else if (! strcmp (arg, "d64")) { rs6000_darwin64_abi = 1; - warning (0, "Using darwin64 ABI"); + warning (0, "using darwin64 ABI"); } else if (! strcmp (arg, "d32")) { rs6000_darwin64_abi = 0; - warning (0, "Using old darwin ABI"); + warning (0, "using old darwin ABI"); } else if (! strcmp (arg, "ibmlongdouble")) { rs6000_explicit_options.ieee = true; rs6000_ieeequad = 0; - warning (0, "Using IBM extended precision long double"); + warning (0, "using IBM extended precision long double"); } else if (! strcmp (arg, "ieeelongdouble")) { rs6000_explicit_options.ieee = true; rs6000_ieeequad = 1; - warning (0, "Using IEEE extended precision long double"); + warning (0, "using IEEE extended precision long double"); } else @@ -4377,7 +4377,7 @@ rs6000_handle_option (size_t code, const char *arg, int value) rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE; if (value != 64 && value != 128) { - error ("Unknown switch -mlong-double-%s", arg); + error ("unknown switch -mlong-double-%s", arg); rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE; return false; } @@ -9631,7 +9631,7 @@ def_builtin (int mask, const char *name, tree type, int code) { tree t; if (rs6000_builtin_decls[code]) - fatal_error ("internal error: builtin function to %s already processed.", + fatal_error ("internal error: builtin function to %s already processed", name); rs6000_builtin_decls[code] = t = @@ -19708,7 +19708,7 @@ rs6000_savres_routine_name (rs6000_stack_t *info, int regno, } } else if (DEFAULT_ABI == ABI_DARWIN) - sorry ("Out-of-line save/restore routines not supported on Darwin"); + sorry ("out-of-line save/restore routines not supported on Darwin"); sprintf (savres_routine_name, "%s%d%s", prefix, regno, suffix); diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h index de2ebd54028..4fda7fd06e3 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -840,7 +840,7 @@ SVR4_ASM_SPEC \ #define LINK_START_FREEBSD_SPEC "" #define LINK_OS_FREEBSD_SPEC "\ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c index 09c44733401..968d65f2f7e 100644 --- a/gcc/config/rx/rx.c +++ b/gcc/config/rx/rx.c @@ -2206,7 +2206,7 @@ rx_handle_option (size_t code, const char * arg ATTRIBUTE_UNUSED, int value) case OPT_fpu: if (rx_cpu_type == RX200) - error ("The RX200 cpu does not have FPU hardware"); + error ("the RX200 cpu does not have FPU hardware"); break; default: diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 9e663a742e2..11ca919af28 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -1641,10 +1641,10 @@ s390_option_override (void) if (target_flags_explicit & MASK_HARD_DFP) { if (!TARGET_CPU_DFP) - error ("Hardware decimal floating point instructions" + error ("hardware decimal floating point instructions" " not available on %s", s390_arch_string); if (!TARGET_ZARCH) - error ("Hardware decimal floating point instructions" + error ("hardware decimal floating point instructions" " not available in ESA/390 mode"); } else @@ -1654,7 +1654,7 @@ s390_option_override (void) if ((target_flags_explicit & MASK_SOFT_FLOAT) && TARGET_SOFT_FLOAT) { if ((target_flags_explicit & MASK_HARD_DFP) && TARGET_HARD_DFP) - error ("-mhard-dfp can't be used in conjunction with -msoft-float"); + error ("-mhard-dfp can%'t be used in conjunction with -msoft-float"); target_flags &= ~MASK_HARD_DFP; } diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index efad46b12f1..9d8bb536c4f 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -11605,7 +11605,7 @@ sh_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED, break; } if (scratch1 == scratch0) - error ("Need a second call-clobbered general purpose register"); + error ("need a second call-clobbered general purpose register"); for (i = FIRST_TARGET_REG; i <= LAST_TARGET_REG; i++) if (call_used_regs[i] && ! fixed_regs[i]) { @@ -11613,7 +11613,7 @@ sh_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED, break; } if (scratch2 == scratch0) - error ("Need a call-clobbered target register"); + error ("need a call-clobbered target register"); } this_value = plus_constant (this_rtx, delta); diff --git a/gcc/config/sh/symbian-base.c b/gcc/config/sh/symbian-base.c index 03c58344cfd..6bfe7cbc559 100644 --- a/gcc/config/sh/symbian-base.c +++ b/gcc/config/sh/symbian-base.c @@ -1,6 +1,6 @@ /* Routines for GCC for a Symbian OS targeted SH backend, shared by both the C and C++ compilers. - Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by RedHat. Most of this code is stolen from i386/winnt.c. @@ -117,7 +117,7 @@ sh_symbian_mark_dllimport (tree decl) { /* Already done, but do a sanity check to prevent assembler errors. */ if (!DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl)) - error ("failure in redeclaration of %q+D: dllimport'd symbol lacks external linkage", + error ("failure in redeclaration of %q+D: dllimport%'d symbol lacks external linkage", decl); } else diff --git a/gcc/config/sh/symbian-c.c b/gcc/config/sh/symbian-c.c index 32a11664367..cbffdb56581 100644 --- a/gcc/config/sh/symbian-c.c +++ b/gcc/config/sh/symbian-c.c @@ -1,5 +1,5 @@ /* Routines for C compiler part of GCC for a Symbian OS targeted SH backend. - Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by RedHat. Most of this code is stolen from i386/winnt.c. @@ -94,7 +94,7 @@ sh_symbian_is_dllimported (tree decl) && TREE_PUBLIC (decl) && !DECL_EXTERNAL (decl)) { - error ("definition of static data member %q+D of dllimport'd class", + error ("definition of static data member %q+D of dllimport%'d class", decl); return false; } diff --git a/gcc/config/sh/symbian-cxx.c b/gcc/config/sh/symbian-cxx.c index 5f1ef93ca6e..4684c3d5117 100644 --- a/gcc/config/sh/symbian-cxx.c +++ b/gcc/config/sh/symbian-cxx.c @@ -1,5 +1,5 @@ /* Routines for C++ support for GCC for a Symbian OS targeted SH backend. - Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by RedHat. Most of this code is stolen from i386/winnt.c. @@ -118,7 +118,7 @@ sh_symbian_is_dllimported (tree decl) && !DECL_EXTERNAL (decl)) { if (!DECL_VIRTUAL_P (decl)) - error ("definition of static data member %q+D of dllimport'd class", + error ("definition of static data member %q+D of dllimport%'d class", decl); return false; } diff --git a/gcc/config/sparc/freebsd.h b/gcc/config/sparc/freebsd.h index 9c86f5c9ac2..541010a205e 100644 --- a/gcc/config/sparc/freebsd.h +++ b/gcc/config/sparc/freebsd.h @@ -1,5 +1,6 @@ /* Definitions for Sun SPARC64 running FreeBSD using the ELF format - Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2010 + Free Software Foundation, Inc. Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi. This file is part of GCC. @@ -31,7 +32,7 @@ along with GCC; see the file COPYING3. If not see #define LINK_SPEC "%(link_arch) \ %{!mno-relax:%{!r:-relax}} \ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ + %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ %{symbolic:-Bsymbolic} \ diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c index beaa1177c92..d98c57127f3 100644 --- a/gcc/config/spu/spu.c +++ b/gcc/config/spu/spu.c @@ -539,7 +539,7 @@ spu_option_override (void) else if (strcmp (&spu_arch_string[0], "celledp") == 0) spu_arch = PROCESSOR_CELLEDP; else - error ("Unknown architecture '%s'", &spu_arch_string[0]); + error ("unknown architecture %qs", &spu_arch_string[0]); } /* Determine processor to tune for. */ @@ -550,7 +550,7 @@ spu_option_override (void) else if (strcmp (&spu_tune_string[0], "celledp") == 0) spu_tune = PROCESSOR_CELLEDP; else - error ("Unknown architecture '%s'", &spu_tune_string[0]); + error ("unknown architecture %qs", &spu_tune_string[0]); } /* Change defaults according to the processor architecture. */ @@ -6423,7 +6423,7 @@ spu_check_builtin_parm (struct spu_builtin_description *d, rtx op, int p) int range = p - SPU_BTI_7; if (!CONSTANT_P (op)) - error ("%s expects an integer literal in the range [%d, %d].", + error ("%s expects an integer literal in the range [%d, %d]", d->name, spu_builtin_range[range].low, spu_builtin_range[range].high); @@ -6443,8 +6443,7 @@ spu_check_builtin_parm (struct spu_builtin_description *d, rtx op, int p) /* The default for v is 0 which is valid in every range. */ if (v < spu_builtin_range[range].low || v > spu_builtin_range[range].high) - error ("%s expects an integer literal in the range [%d, %d]. (" - HOST_WIDE_INT_PRINT_DEC ")", + error ("%s expects an integer literal in the range [%d, %d]. (%wd)", d->name, spu_builtin_range[range].low, spu_builtin_range[range].high, v); @@ -6473,7 +6472,7 @@ spu_check_builtin_parm (struct spu_builtin_description *d, rtx op, int p) || (GET_CODE (op) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (op)) || (v & ((1 << lsbits) - 1)) != 0) - warning (0, "%d least significant bits of %s are ignored.", lsbits, + warning (0, "%d least significant bits of %s are ignored", lsbits, d->name); } } diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c index 560fe34a91f..81598628406 100644 --- a/gcc/config/v850/v850.c +++ b/gcc/config/v850/v850.c @@ -2416,7 +2416,7 @@ construct_save_jarl (rtx op) if (count <= (TARGET_LONG_CALLS ? 3 : 2)) { - error ("bogus JARL construction: %d\n", count); + error ("bogus JARL construction: %d", count); return NULL; } diff --git a/gcc/convert.c b/gcc/convert.c index 57eedbf5388..eba919530af 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -850,7 +850,7 @@ convert_to_integer (tree type, tree expr) case VECTOR_TYPE: if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { - error ("can't convert between vector values of different size"); + error ("can%'t convert between vector values of different size"); return error_mark_node; } return build1 (VIEW_CONVERT_EXPR, type, expr); @@ -926,13 +926,13 @@ convert_to_vector (tree type, tree expr) case VECTOR_TYPE: if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { - error ("can't convert between vector values of different size"); + error ("can%'t convert between vector values of different size"); return error_mark_node; } return build1 (VIEW_CONVERT_EXPR, type, expr); default: - error ("can't convert value to a vector"); + error ("can%'t convert value to a vector"); return error_mark_node; } } diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04f95bbbc97..e5fa280dc77 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,22 @@ +2010-11-10 Joseph Myers <joseph@codesourcery.com> + + * cvt.c (cp_convert_to_pointer): Use %' in diagnostic. + * decl.c (layout_var_decl, maybe_commonize_var, grokdeclarator): + Use %' in diagnostics. + * decl2.c (check_classfn): Use %' in diagnostic. + * init.c (build_java_class_ref): Use %' in diagnostic. + (build_delete): Remove trailing '.' from diagnostic. + * method.c (do_build_copy_assign, walk_field_subobs): Use %' in + diagnostics. + * name-lookup.c (pushdecl_maybe_friend): Use %' in diagnostic. + * parser.c (cp_parser_exception_specification_opt): Remove + trailing '.' from diagnostic. + (cp_parser_objc_interstitial_code): Use %qs for quoting in + diagnostic. + * pt.c (check_valid_ptrmem_cst_expr): Use %< and %> for quoting in + diagnostic. + * repo.c (reopen_repo_file_for_write): Use %' in diagnostic. + 2010-11-10 Nathan Froyd <froydnj@codesourcery.com> PR c++/46065 diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 2f7823f76d9..b10e5589d90 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -88,7 +88,7 @@ cp_convert_to_pointer (tree type, tree expr) intype = complete_type (intype); if (!COMPLETE_TYPE_P (intype)) { - error ("can't convert from incomplete type %qT to %qT", + error ("can%'t convert from incomplete type %qT to %qT", intype, type); return error_mark_node; } diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 93af4b45ff7..7891c1e1dc2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4691,7 +4691,7 @@ layout_var_decl (tree decl) /* An automatic variable with an incomplete type: that is an error. Don't talk about array types here, since we took care of that message in grokdeclarator. */ - error ("storage size of %qD isn't known", decl); + error ("storage size of %qD isn%'t known", decl); TREE_TYPE (decl) = error_mark_node; } #if 0 @@ -4714,7 +4714,7 @@ layout_var_decl (tree decl) constant_expression_warning (DECL_SIZE (decl)); else { - error ("storage size of %qD isn't constant", decl); + error ("storage size of %qD isn%'t constant", decl); TREE_TYPE (decl) = error_mark_node; } } @@ -4761,7 +4761,7 @@ maybe_commonize_var (tree decl) DECL_COMMON (decl) = 0; warning_at (input_location, 0, "sorry: semantics of inline function static " - "data %q+#D are wrong (you'll wind up " + "data %q+#D are wrong (you%'ll wind up " "with multiple copies)", decl); warning_at (DECL_SOURCE_LOCATION (decl), 0, " you can work around this by removing " @@ -8790,7 +8790,7 @@ grokdeclarator (const cp_declarator *declarator, else if (friendp) { if (initialized) - error ("can't initialize friend function %qs", name); + error ("can%'t initialize friend function %qs", name); if (virtualp) { /* Cannot be both friend and virtual. */ @@ -8800,7 +8800,7 @@ grokdeclarator (const cp_declarator *declarator, if (decl_context == NORMAL) error ("friend declaration not in class definition"); if (current_function_decl && funcdef_flag) - error ("can't define friend function %qs in a local " + error ("can%'t define friend function %qs in a local " "class definition", name); } diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index e00549eca3b..dfb7e45b1cc 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -624,7 +624,7 @@ check_classfn (tree ctype, tree function, tree template_parms) && !comp_template_parms (template_parms, DECL_TEMPLATE_PARMS (function))) { - error ("template parameter lists provided don't match the " + error ("template parameter lists provided don%'t match the " "template parameters of %qD", function); return error_mark_node; } diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 0ecd61d3aed..00b5d9be551 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2629,7 +2629,7 @@ build_java_class_ref (tree type) } if (!field) { - error ("can't find %<class$%> in %qT", type); + error ("can%'t find %<class$%> in %qT", type); return error_mark_node; } } @@ -3307,7 +3307,7 @@ build_delete (tree type, tree addr, special_function_kind auto_delete, cxx_incomplete_type_diagnostic (addr, type, DK_WARNING); inform (input_location, "neither the destructor nor the class-specific " "operator delete will be called, even if they are " - "declared when the class is defined."); + "declared when the class is defined"); } complete_p = false; } diff --git a/gcc/cp/method.c b/gcc/cp/method.c index d0ed0f4e9cb..27346d08a23 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -645,13 +645,13 @@ do_build_copy_assign (tree fndecl) if (CP_TYPE_CONST_P (expr_type)) { - error ("non-static const member %q#D, can't use default " + error ("non-static const member %q#D, can%'t use default " "assignment operator", field); continue; } else if (TREE_CODE (expr_type) == REFERENCE_TYPE) { - error ("non-static reference member %q#D, can't use " + error ("non-static reference member %q#D, can%'t use " "default assignment operator", field); continue; } @@ -976,13 +976,13 @@ walk_field_subobs (tree fields, tree fnname, special_function_kind sfk, if (CP_TYPE_CONST_P (mem_type) && !CLASS_TYPE_P (mem_type)) { if (msg) - error ("non-static const member %q#D, can't use default " + error ("non-static const member %q#D, can%'t use default " "assignment operator", field); } else if (TREE_CODE (mem_type) == REFERENCE_TYPE) { if (msg) - error ("non-static reference member %q#D, can't use " + error ("non-static reference member %q#D, can%'t use " "default assignment operator", field); } else diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 0a93da88083..5fe60f90458 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -992,7 +992,7 @@ pushdecl_maybe_friend (tree x, bool is_friend) /* OK */; else { - warning (0, "extern declaration of %q#D doesn't match", x); + warning (0, "extern declaration of %q#D doesn%'t match", x); warning (0, "global declaration %q+#D", oldglobal); } } diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 489794161f5..906b0c36565 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18212,7 +18212,7 @@ cp_parser_exception_specification_opt (cp_parser* parser) /* Enable this once a lot of code has transitioned to noexcept? */ if (cxx_dialect == cxx0x && !in_system_header) warning (OPT_Wdeprecated, "dynamic exception specifications are " - "deprecated in C++0x; use %<noexcept%> instead."); + "deprecated in C++0x; use %<noexcept%> instead"); #endif /* Consume the `throw'. */ @@ -21972,7 +21972,7 @@ cp_parser_objc_interstitial_code (cp_parser* parser) else if (token->type == CPP_OPEN_BRACE || token->type == CPP_CLOSE_BRACE) { cp_lexer_consume_token (parser->lexer); - error ("stray `%s' between Objective-C++ methods", + error ("stray %qs between Objective-C++ methods", token->type == CPP_OPEN_BRACE ? "{" : "}"); } /* Finally, try to parse a block-declaration, or a function-definition. */ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ed04b2be59e..7a06038c674 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5234,7 +5234,7 @@ check_valid_ptrmem_cst_expr (tree type, tree expr, { error ("%qE is not a valid template argument for type %qT", expr, type); - error ("it must be a pointer-to-member of the form `&X::Y'"); + error ("it must be a pointer-to-member of the form %<&X::Y%>"); } return false; } diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c index 357dcd97650..16a192e4de9 100644 --- a/gcc/cp/repo.c +++ b/gcc/cp/repo.c @@ -224,7 +224,7 @@ reopen_repo_file_for_write (void) if (repo_file == 0) { - error ("can't create repository information file %qs", repo_name); + error ("can%'t create repository information file %qs", repo_name); flag_use_repository = 0; } diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c index 23d35124a17..a81fe7f56ee 100644 --- a/gcc/dbgcnt.c +++ b/gcc/dbgcnt.c @@ -133,7 +133,7 @@ dbg_cnt_process_opt (const char *arg) { char *buffer = XALLOCAVEC (char, arg - start + 2); sprintf (buffer, "%*c", (int)(1 + (arg - start)), '^'); - error ("Can not find a valid counter:value pair:"); + error ("cannot find a valid counter:value pair:"); error ("-fdbg-cnt=%s", start); error (" %s", buffer); } diff --git a/gcc/expmed.c b/gcc/expmed.c index 7ff55e7bafd..1f98bcf4cf5 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -1800,11 +1800,11 @@ extract_fixed_bit_field (enum machine_mode tmode, rtx op0, { informed_about_misalignment = true; inform (input_location, - "When a volatile object spans multiple type-sized locations," + "when a volatile object spans multiple type-sized locations," " the compiler must choose between using a single mis-aligned access to" " preserve the volatility, or using multiple aligned accesses to avoid" - " runtime faults. This code may fail at runtime if the hardware does" - " not allow this access."); + " runtime faults; this code may fail at runtime if the hardware does" + " not allow this access"); } } } diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 48a2e4f77c4..1478f9aa979 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2010-11-10 Joseph Myers <joseph@codesourcery.com> + * trans-array.c (gfc_trans_deferred_array): Use "front-end" + spelling in diagnostic. + * trans.c (gfc_allocate_array_with_status): Add missing space in + diagnostic. + +2010-11-10 Joseph Myers <joseph@codesourcery.com> + * cpp.c (asm_file_name): Don't declare here. 2010-11-10 Tobias Burnus <burnus@net-b.de> diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 12330aef8b6..3d5e5bae58f 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6478,7 +6478,7 @@ gfc_trans_deferred_array (gfc_symbol * sym, gfc_wrapped_block * block) /* Make sure the frontend gets these right. */ if (!(sym->attr.pointer || sym->attr.allocatable || sym_has_alloc_comp)) - fatal_error ("Possible frontend bug: Deferred array size without pointer, " + fatal_error ("Possible front-end bug: Deferred array size without pointer, " "allocatable attribute or derived type without allocatable " "components."); diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index a899f22dd0e..b84029bfd5d 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -780,7 +780,7 @@ gfc_allocate_array_with_status (stmtblock_t * block, tree mem, tree size, else error = gfc_trans_runtime_error (true, NULL, "Attempting to allocate already allocated" - "variable"); + " variable"); if (status != NULL_TREE && !integer_zerop (status)) { diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index cf389337391..2c3c8b3061d 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c @@ -481,7 +481,7 @@ write_pch_globals (const struct ggc_root_tab * const *tab, { if (fwrite (&ptr, sizeof (void *), 1, state->f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); } else { @@ -489,7 +489,7 @@ write_pch_globals (const struct ggc_root_tab * const *tab, htab_find_with_hash (saving_htab, ptr, POINTER_HASH (ptr)); if (fwrite (&new_ptr->new_addr, sizeof (void *), 1, state->f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); } } } @@ -563,7 +563,7 @@ gt_pch_save (FILE *f) for (rt = gt_pch_scalar_rtab; *rt; rt++) for (rti = *rt; rti->base != NULL; rti++) if (fwrite (rti->base, rti->stride, 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); /* Write out all the global pointers, after translation. */ write_pch_globals (gt_ggc_rtab, &state); @@ -575,17 +575,17 @@ gt_pch_save (FILE *f) long o; o = ftell (state.f) + sizeof (mmi); if (o == -1) - fatal_error ("can't get position in PCH file: %m"); + fatal_error ("can%'t get position in PCH file: %m"); mmi.offset = mmap_offset_alignment - o % mmap_offset_alignment; if (mmi.offset == mmap_offset_alignment) mmi.offset = 0; mmi.offset += o; } if (fwrite (&mmi, sizeof (mmi), 1, state.f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); if (mmi.offset != 0 && fseek (state.f, mmi.offset, SEEK_SET) != 0) - fatal_error ("can't write padding to PCH file: %m"); + fatal_error ("can%'t write padding to PCH file: %m"); ggc_pch_prepare_write (state.d, state.f); @@ -640,7 +640,7 @@ gt_pch_restore (FILE *f) for (rt = gt_pch_scalar_rtab; *rt; rt++) for (rti = *rt; rti->base != NULL; rti++) if (fread (rti->base, rti->stride, 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); /* Read in all the global pointers, in 6 easy loops. */ for (rt = gt_ggc_rtab; *rt; rt++) @@ -648,17 +648,17 @@ gt_pch_restore (FILE *f) for (i = 0; i < rti->nelt; i++) if (fread ((char *)rti->base + rti->stride * i, sizeof (void *), 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); for (rt = gt_pch_cache_rtab; *rt; rt++) for (rti = *rt; rti->base != NULL; rti++) for (i = 0; i < rti->nelt; i++) if (fread ((char *)rti->base + rti->stride * i, sizeof (void *), 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); if (fread (&mmi, sizeof (mmi), 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); result = host_hooks.gt_pch_use_address (mmi.preferred_base, mmi.size, fileno (f), mmi.offset); @@ -668,10 +668,10 @@ gt_pch_restore (FILE *f) { if (fseek (f, mmi.offset, SEEK_SET) != 0 || fread (mmi.preferred_base, mmi.size, 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); } else if (fseek (f, mmi.offset + mmi.size, SEEK_SET) != 0) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); ggc_pch_read (f, mmi.preferred_base); diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c index 8b41f404b4a..c0d2f9adce4 100644 --- a/gcc/ggc-page.c +++ b/gcc/ggc-page.c @@ -2183,7 +2183,7 @@ ggc_pch_write_object (struct ggc_pch_data *d ATTRIBUTE_UNUSED, } if (fwrite (x, size, 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); /* If SIZE is not the same as OBJECT_SIZE(order), then we need to pad the object out to OBJECT_SIZE(order). This happens for strings. */ @@ -2199,13 +2199,13 @@ ggc_pch_write_object (struct ggc_pch_data *d ATTRIBUTE_UNUSED, if (padding <= sizeof(emptyBytes)) { if (fwrite (emptyBytes, 1, padding, f) != padding) - fatal_error ("can't write PCH file"); + fatal_error ("can%'t write PCH file"); } else { /* Larger than our buffer? Just default to fseek. */ if (fseek (f, padding, SEEK_CUR) != 0) - fatal_error ("can't write PCH file"); + fatal_error ("can%'t write PCH file"); } } @@ -2214,14 +2214,14 @@ ggc_pch_write_object (struct ggc_pch_data *d ATTRIBUTE_UNUSED, && fseek (f, ROUND_UP_VALUE (d->d.totals[order] * OBJECT_SIZE (order), G.pagesize), SEEK_CUR) != 0) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); } void ggc_pch_finish (struct ggc_pch_data *d, FILE *f) { if (fwrite (&d->d, sizeof (d->d), 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); free (d); } @@ -2311,7 +2311,7 @@ ggc_pch_read (FILE *f, void *addr) /* Allocate the appropriate page-table entries for the pages read from the PCH file. */ if (fread (&d, sizeof (d), 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); for (i = 0; i < NUM_ORDERS; i++) { diff --git a/gcc/ggc-zone.c b/gcc/ggc-zone.c index 7d8420a11b7..0fd5c2b234a 100644 --- a/gcc/ggc-zone.c +++ b/gcc/ggc-zone.c @@ -2427,10 +2427,10 @@ ggc_pch_write_object (struct ggc_pch_data *d, size_t size, bool is_string ATTRIBUTE_UNUSED) { if (fseek (f, (size_t) newx - d->orig_base + d->start_offset, SEEK_SET) != 0) - fatal_error ("can't seek PCH file: %m"); + fatal_error ("can%'t seek PCH file: %m"); if (fwrite (x, size, 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); } void @@ -2438,14 +2438,14 @@ ggc_pch_finish (struct ggc_pch_data *d, FILE *f) { /* Write out the allocation bitmap. */ if (fseek (f, d->start_offset + d->d.total, SEEK_SET) != 0) - fatal_error ("can't seek PCH file: %m"); + fatal_error ("can%'t seek PCH file: %m"); if (fwrite (d->alloc_bits, d->alloc_size, 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); /* Done with the PCH, so write out our footer. */ if (fwrite (&d->d, sizeof (d->d), 1, f) != 1) - fatal_error ("can't write PCH file: %m"); + fatal_error ("can%'t write PCH file: %m"); free (d->alloc_bits); free (d); @@ -2464,7 +2464,7 @@ ggc_pch_read (FILE *f, void *addr) char *p; if (fread (&d, sizeof (d), 1, f) != 1) - fatal_error ("can't read PCH file: %m"); + fatal_error ("can%'t read PCH file: %m"); alloc_size = CEIL (d.total, BYTES_PER_ALLOC_BIT * 8); alloc_size = ROUND_UP (alloc_size, MAX_ALIGNMENT); diff --git a/gcc/graph.c b/gcc/graph.c index 7c2a5700f69..64e6c3fe15d 100644 --- a/gcc/graph.c +++ b/gcc/graph.c @@ -1,5 +1,5 @@ /* Output routines for graphical representation. - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007, 2008 + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007, 2008, 2010 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -408,7 +408,7 @@ clean_graph_dump_file (const char *base) fp = fopen (buf, "w"); if (fp == NULL) - fatal_error ("can't open %s: %m", buf); + fatal_error ("can%'t open %s: %m", buf); gcc_assert (graph_dump_format == vcg); fputs ("graph: {\nport_sharing: no\n", fp); diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index 9f67e855d0a..0dbd61c8e6f 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -606,7 +606,7 @@ graphite_read_scop_file (FILE *file, scop_p scop) if (strcmp (tmp, "SCoP 1")) { - error ("The file is not in OpenScop format.\n"); + error ("the file is not in OpenScop format"); return false; } @@ -617,7 +617,7 @@ graphite_read_scop_file (FILE *file, scop_p scop) if (strcmp (language, "Gimple")) { - error ("The language is not recognized\n"); + error ("the language is not recognized"); return false; } @@ -628,8 +628,8 @@ graphite_read_scop_file (FILE *file, scop_p scop) if ((size_t) params != scop->nb_params) { - error ("Parameters number in the scop file is different from the" - " internal scop parameter number."); + error ("parameters number in the scop file is different from the" + " internal scop parameter number"); return false; } @@ -641,8 +641,8 @@ graphite_read_scop_file (FILE *file, scop_p scop) if (nb_statements != VEC_length (poly_bb_p, SCOP_BBS (scop))) { - error ("Number of statements in the OpenScop file does not match" - " the graphite internal statements number."); + error ("number of statements in the OpenScop file does not match" + " the graphite internal statements number"); return false; } diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4b9767768fe..a635c1e421c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2010-11-10 Joseph Myers <joseph@codesourcery.com> + + * expr.c (expand_java_field_op): Use %' in diagnostic. + * jcf-parse.c (java_parse_file): Use %' in diagnostics. + * jvspec.c (lang_specific_driver): Use %' in diagnostic. + * lang.c (java_post_options): Use %' in diagnostics. + 2010-11-06 Joern Rennecke <amylaar@spamcop.net> PR middle-end/46314 diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 85cf1a2bcae..f6c6c1bbe0a 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2920,7 +2920,7 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index) if (FIELD_FINAL (field_decl)) { if (DECL_CONTEXT (field_decl) != current_class) - error ("assignment to final field %q+D not in field's class", + error ("assignment to final field %q+D not in field%'s class", field_decl); /* We used to check for assignments to final fields not occurring in the class initializer or in a constructor diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 30f171cdc90..ce1de5ae79d 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1750,7 +1750,7 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED) int avail = 2000; finput = fopen (main_input_filename, "r"); if (finput == NULL) - fatal_error ("can't open %s: %m", input_filename); + fatal_error ("can%'t open %s: %m", input_filename); list = XNEWVEC (char, avail); next = list; for (;;) @@ -1885,11 +1885,11 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED) /* Close previous descriptor, if any */ if (finput && fclose (finput)) - fatal_error ("can't close input file %s: %m", main_input_filename); + fatal_error ("can%'t close input file %s: %m", main_input_filename); finput = fopen (filename, "rb"); if (finput == NULL) - fatal_error ("can't open %s: %m", filename); + fatal_error ("can%'t open %s: %m", filename); #ifdef IO_BUFFER_SIZE setvbuf (finput, xmalloc (IO_BUFFER_SIZE), diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 7fe44f3b23d..4240db1230d 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -393,7 +393,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, } if (saw_D && ! main_class_name) - fatal_error ("can't specify %<-D%> without %<--main%>"); + fatal_error ("can%'t specify %<-D%> without %<--main%>"); if (main_class_name && ! verify_class_name (main_class_name)) fatal_error ("%qs is not a valid class name", main_class_name); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 45722e56480..8065efa5c7a 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -599,7 +599,7 @@ java_post_options (const char **pfilename) filename = "stdin"; if (dependency_tracking) - error ("can't do dependency tracking with input from stdin"); + error ("can%'t do dependency tracking with input from stdin"); } else { @@ -615,7 +615,7 @@ java_post_options (const char **pfilename) { dot = strrchr (filename, '.'); if (dot == NULL) - error ("couldn't determine target name for dependency tracking"); + error ("couldn%'t determine target name for dependency tracking"); else { char *buf = XNEWVEC (char, dot - filename + diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index 85a7c4035c5..c4a3f668b9b 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -1444,7 +1444,7 @@ input_profile_summary (struct lto_input_block *ib) || profile_info->sum_all != lto_input_sleb128 (ib) || profile_info->run_max != lto_input_sleb128 (ib) || profile_info->sum_max != lto_input_sleb128 (ib)) - sorry ("Combining units with different profiles is not supported."); + sorry ("combining units with different profiles is not supported"); /* We allow some units to have profile and other to not have one. This will just make unprofiled units to be size optimized that is sane. */ } @@ -1473,7 +1473,7 @@ input_cgraph (void) ib = lto_create_simple_input_block (file_data, LTO_section_cgraph, &data, &len); if (!ib) - fatal_error ("Cannot find LTO cgraph in %s\n", file_data->file_name); + fatal_error ("cannot find LTO cgraph in %s", file_data->file_name); input_profile_summary (ib); file_data->cgraph_node_encoder = lto_cgraph_encoder_new (); nodes = input_cgraph_1 (file_data, ib); @@ -1483,7 +1483,7 @@ input_cgraph (void) ib = lto_create_simple_input_block (file_data, LTO_section_varpool, &data, &len); if (!ib) - fatal_error ("Cannot find LTO varpool in %s\n", file_data->file_name); + fatal_error ("cannot find LTO varpool in %s", file_data->file_name); varpool = input_varpool_1 (file_data, ib); lto_destroy_simple_input_block (file_data, LTO_section_varpool, ib, data, len); @@ -1491,7 +1491,7 @@ input_cgraph (void) ib = lto_create_simple_input_block (file_data, LTO_section_refs, &data, &len); if (!ib) - fatal_error("Cannot find LTO section refs in %s\n", file_data->file_name); + fatal_error("cannot find LTO section refs in %s", file_data->file_name); input_refs (ib, nodes, varpool); lto_destroy_simple_input_block (file_data, LTO_section_refs, ib, data, len); diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index c963d6f4bc3..0de4a977b19 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2010-11-10 Joseph Myers <joseph@codesourcery.com> + + * lto.c (lto_resolution_read): Start diagnostics with lowercase + letters and remove trailing '.'. + (lto_file_finalize): Start diagnostic with a lowercase letter. + 2010-11-02 Ian Lance Taylor <iant@google.com> * lto-object.c: New file. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index 0516efea4ce..d3b9228b6a8 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -392,7 +392,7 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file) t = fscanf (resolution, "%u %x %26s %*[^\n]\n", &index, &id, r_str); if (t != 3) - internal_error ("Invalid line in the resolution file."); + internal_error ("invalid line in the resolution file"); if (index > max_index) max_index = index; @@ -405,13 +405,13 @@ lto_resolution_read (splay_tree file_ids, FILE *resolution, lto_file *file) } } if (j == lto_resolution_str_len) - internal_error ("Invalid resolution in the resolution file."); + internal_error ("invalid resolution in the resolution file"); if (!(nd && nd->key == id)) { nd = splay_tree_lookup (file_ids, id); if (nd == NULL) - internal_error ("Resolution sub id %x not in object file", id); + internal_error ("resolution sub id %x not in object file", id); } file_data = (struct lto_file_decl_data *)nd->value; @@ -496,7 +496,7 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file) data = lto_get_section_data (file_data, LTO_section_decls, NULL, &len); if (data == NULL) { - internal_error ("Cannot read LTO decls from %s", file_data->file_name); + internal_error ("cannot read LTO decls from %s", file_data->file_name); return; } lto_read_decls (file_data, data, file_data->resolutions); diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 3c814c6ae48..d60e2fb022d 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,5 +1,10 @@ 2010-11-10 Joseph Myers <joseph@codesourcery.com> + * objc-act.c (objc_init): Use %' in diagnostic. + (objc_set_method_opt): Remove trailing '.' from diagnostic. + +2010-11-10 Joseph Myers <joseph@codesourcery.com> + * objc-act.c (dump_base_name): Don't declare here. 2010-11-08 Nicola Pero <nicola.pero@meta-innovation.com> diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index bc6cc029ff7..6f499c368be 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -559,7 +559,7 @@ objc_init (void) register char * const dumpname = concat (dump_base_name, ".decl", NULL); gen_declaration_file = fopen (dumpname, "w"); if (gen_declaration_file == 0) - fatal_error ("can't open %s: %m", dumpname); + fatal_error ("can%'t open %s: %m", dumpname); free (dumpname); } @@ -821,7 +821,7 @@ objc_set_method_opt (bool optional) if (!objc_interface_context || TREE_CODE (objc_interface_context) != PROTOCOL_INTERFACE_TYPE) { - error ("@optional/@required is allowed in @protocol context only."); + error ("@optional/@required is allowed in @protocol context only"); objc_method_optional_flag = false; } } diff --git a/gcc/opts.c b/gcc/opts.c index 7b1d265bc84..a7557ed2a6a 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -1092,12 +1092,12 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set) if (!opts->x_flag_unit_at_a_time) { if (opts->x_flag_section_anchors && opts_set->x_flag_section_anchors) - error ("Section anchors must be disabled when unit-at-a-time " - "is disabled."); + error ("section anchors must be disabled when unit-at-a-time " + "is disabled"); opts->x_flag_section_anchors = 0; if (opts->x_flag_toplevel_reorder == 1) - error ("Toplevel reorder must be disabled when unit-at-a-time " - "is disabled."); + error ("toplevel reorder must be disabled when unit-at-a-time " + "is disabled"); opts->x_flag_toplevel_reorder = 0; } @@ -1235,7 +1235,7 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set) { if (opts->x_flag_lto_partition_balanced && opts->x_flag_lto_partition_1to1) - error ("Only one -flto-partitoin value can be specified"); + error ("only one -flto-partition value can be specified"); if (!opts->x_flag_whopr && !opts->x_flag_wpa && !opts->x_flag_ltrans) error ("-flto-partition has no effect without -fwhopr"); } @@ -1924,7 +1924,7 @@ common_handle_option (struct gcc_options *opts, #ifdef ENABLE_PLUGIN add_new_plugin (arg); #else - error ("Plugin support is disabled. Configure with --enable-plugin."); + error ("plugin support is disabled; configure with --enable-plugin"); #endif break; @@ -1932,7 +1932,7 @@ common_handle_option (struct gcc_options *opts, #ifdef ENABLE_PLUGIN parse_plugin_arg_opt (arg); #else - error ("Plugin support is disabled. Configure with --enable-plugin."); + error ("plugin support is disabled; configure with --enable-plugin"); #endif break; diff --git a/gcc/passes.c b/gcc/passes.c index 5da5ea8ab6c..da9bb15dcf1 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -598,7 +598,7 @@ position_pass (struct register_pass_info *new_pass_info, pass = new_pass; break; default: - error ("Invalid pass positioning operation"); + error ("invalid pass positioning operation"); return false; } diff --git a/gcc/plugin.c b/gcc/plugin.c index bfcff3e9cde..6fd20585b3e 100644 --- a/gcc/plugin.c +++ b/gcc/plugin.c @@ -180,7 +180,7 @@ add_new_plugin (const char* plugin_name) { plugin = (struct plugin_name_args *) *slot; if (strcmp (plugin->full_name, plugin_name)) - error ("Plugin %s was specified with different paths:\n%s\n%s", + error ("plugin %s was specified with different paths:\n%s\n%s", plugin->base_name, plugin->full_name, plugin_name); return; } @@ -226,7 +226,7 @@ parse_plugin_arg_opt (const char *arg) { if (key_parsed) { - error ("Malformed option -fplugin-arg-%s (multiple '=' signs)", + error ("malformed option -fplugin-arg-%s (multiple '=' signs)", arg); return; } @@ -242,7 +242,7 @@ parse_plugin_arg_opt (const char *arg) if (!key_start) { - error ("Malformed option -fplugin-arg-%s (missing -<key>[=<value>])", + error ("malformed option -fplugin-arg-%s (missing -<key>[=<value>])", arg); return; } @@ -304,7 +304,7 @@ parse_plugin_arg_opt (const char *arg) plugin->argv[plugin->argc - 1].value = value; } else - error ("Plugin %s should be specified before -fplugin-arg-%s " + error ("plugin %s should be specified before -fplugin-arg-%s " "in the command line", name, arg); /* We don't need the plugin's name anymore. Just release it. */ @@ -424,7 +424,7 @@ register_callback (const char *plugin_name, default: if (event < PLUGIN_EVENT_FIRST_DYNAMIC || event >= event_last) { - error ("Unknown callback event registered by plugin %s", + error ("unknown callback event registered by plugin %s", plugin_name); return; } @@ -452,7 +452,7 @@ register_callback (const char *plugin_name, struct callback_info *new_callback; if (!callback) { - error ("Plugin %s registered a null callback function " + error ("plugin %s registered a null callback function " "for event %s", plugin_name, plugin_event_name[event]); return; } @@ -572,7 +572,7 @@ try_init_one_plugin (struct plugin_name_args *plugin) dl_handle = dlopen (plugin->full_name, RTLD_NOW | RTLD_GLOBAL); if (!dl_handle) { - error ("Cannot load plugin %s\n%s", plugin->full_name, dlerror ()); + error ("cannot load plugin %s\n%s", plugin->full_name, dlerror ()); return false; } @@ -590,7 +590,7 @@ try_init_one_plugin (struct plugin_name_args *plugin) if ((err = dlerror ()) != NULL) { - error ("Cannot find %s in plugin %s\n%s", str_plugin_init_func_name, + error ("cannot find %s in plugin %s\n%s", str_plugin_init_func_name, plugin->full_name, err); return false; } @@ -598,7 +598,7 @@ try_init_one_plugin (struct plugin_name_args *plugin) /* Call the plugin-provided initialization routine with the arguments. */ if ((*plugin_init) (plugin, &gcc_version)) { - error ("Fail to initialize plugin %s", plugin->full_name); + error ("fail to initialize plugin %s", plugin->full_name); return false; } diff --git a/gcc/reload1.c b/gcc/reload1.c index a8a656e6e4b..da354a7e325 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -2089,7 +2089,7 @@ static void spill_failure (rtx insn, enum reg_class rclass) { if (asm_noperands (PATTERN (insn)) >= 0) - error_for_asm (insn, "can't find a register in class %qs while " + error_for_asm (insn, "can%'t find a register in class %qs while " "reloading %<asm%>", reg_class_names[rclass]); else @@ -8615,7 +8615,7 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type) return insn; } - fatal_insn ("Failure trying to reload:", set); + fatal_insn ("failure trying to reload:", set); } /* If IN is a simple operand, use gen_move_insn. */ else if (OBJECT_P (in) || GET_CODE (in) == SUBREG) diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 17e4fe54a37..9d2b73e13f5 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1251,7 +1251,7 @@ place_field (record_layout_info rli, tree field) if (warn_packed_bitfield_compat == 1) inform (input_location, - "Offset of packed bit-field %qD has changed in GCC 4.4", + "offset of packed bit-field %qD has changed in GCC 4.4", field); } else diff --git a/gcc/toplev.c b/gcc/toplev.c index 0a41c02d085..b125c432e08 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1563,7 +1563,7 @@ open_auxiliary_file (const char *ext) filename = concat (aux_base_name, ".", ext, NULL); file = fopen (filename, "w"); if (!file) - fatal_error ("can't open %s for writing: %m", filename); + fatal_error ("can%'t open %s for writing: %m", filename); free (filename); return file; } diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 3b46283e7e6..0745a681347 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2611,13 +2611,13 @@ verify_expr (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) if (!POINTER_TYPE_P (TREE_TYPE (x)) || !is_gimple_mem_ref_addr (x)) { - error ("Invalid first operand of MEM_REF."); + error ("invalid first operand of MEM_REF"); return x; } if (TREE_CODE (TREE_OPERAND (t, 1)) != INTEGER_CST || !POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (t, 1)))) { - error ("Invalid offset operand of MEM_REF."); + error ("invalid offset operand of MEM_REF"); return TREE_OPERAND (t, 1); } if (TREE_CODE (x) == ADDR_EXPR @@ -2636,7 +2636,7 @@ verify_expr (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) break; case MODIFY_EXPR: - error ("MODIFY_EXPR not expected while having tuples."); + error ("MODIFY_EXPR not expected while having tuples"); return *tp; case ADDR_EXPR: @@ -2783,7 +2783,7 @@ verify_expr (tree *tp, int *walk_subtrees, void *data ATTRIBUTE_UNUSED) TREE_TYPE (TREE_OPERAND (t, 1)))) { error ("invalid operand to pointer plus, second operand is not an " - "integer with type of sizetype."); + "integer with type of sizetype"); return t; } /* FALLTHROUGH */ @@ -2951,14 +2951,14 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) && (TREE_CODE (op) == SSA_NAME || is_gimple_min_invariant (op))) { - error ("Conversion of an SSA_NAME on the left hand side."); + error ("conversion of an SSA_NAME on the left hand side"); debug_generic_stmt (expr); return true; } else if (TREE_CODE (op) == SSA_NAME && TYPE_SIZE (TREE_TYPE (expr)) != TYPE_SIZE (TREE_TYPE (op))) { - error ("Conversion of register to a different size."); + error ("conversion of register to a different size"); debug_generic_stmt (expr); return true; } @@ -2973,14 +2973,14 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) { if (!is_gimple_mem_ref_addr (TREE_OPERAND (expr, 0))) { - error ("Invalid address operand in MEM_REF."); + error ("invalid address operand in MEM_REF"); debug_generic_stmt (expr); return true; } if (TREE_CODE (TREE_OPERAND (expr, 1)) != INTEGER_CST || !POINTER_TYPE_P (TREE_TYPE (TREE_OPERAND (expr, 1)))) { - error ("Invalid offset operand in MEM_REF."); + error ("invalid offset operand in MEM_REF"); debug_generic_stmt (expr); return true; } @@ -2990,14 +2990,14 @@ verify_types_in_gimple_reference (tree expr, bool require_lvalue) if (!TMR_BASE (expr) || !is_gimple_mem_ref_addr (TMR_BASE (expr))) { - error ("Invalid address operand in in TARGET_MEM_REF."); + error ("invalid address operand in in TARGET_MEM_REF"); return true; } if (!TMR_OFFSET (expr) || TREE_CODE (TMR_OFFSET (expr)) != INTEGER_CST || !POINTER_TYPE_P (TREE_TYPE (TMR_OFFSET (expr)))) { - error ("Invalid offset operand in TARGET_MEM_REF."); + error ("invalid offset operand in TARGET_MEM_REF"); debug_generic_stmt (expr); return true; } @@ -3116,7 +3116,7 @@ verify_gimple_call (gimple stmt) if (!DECL_STATIC_CHAIN (fn)) { - error ("static chain with function that doesn't use one"); + error ("static chain with function that doesn%'t use one"); return true; } } @@ -3927,7 +3927,7 @@ verify_gimple_phi (gimple stmt) if (TREE_CODE (gimple_phi_result (stmt)) != SSA_NAME) { - error ("Invalid PHI result"); + error ("invalid PHI result"); return true; } @@ -3939,13 +3939,13 @@ verify_gimple_phi (gimple stmt) || (!is_gimple_reg (gimple_phi_result (stmt)) && !is_gimple_addressable (arg))) { - error ("Invalid PHI argument"); + error ("invalid PHI argument"); debug_generic_stmt (arg); return true; } if (!useless_type_conversion_p (type, TREE_TYPE (arg))) { - error ("Incompatible types in PHI argument %u", i); + error ("incompatible types in PHI argument %u", i); debug_generic_stmt (type); debug_generic_stmt (TREE_TYPE (arg)); return true; @@ -4250,7 +4250,7 @@ verify_eh_throw_stmt_node (void **slot, void *data) if (!pointer_set_contains (visited, node->stmt)) { - error ("Dead STMT in EH table"); + error ("dead STMT in EH table"); debug_gimple_stmt (node->stmt); eh_error_found = true; } diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index ca51c664722..c08ae61fd9d 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -641,7 +641,7 @@ verify_def (basic_block bb, basic_block *definition_block, tree ssa_name, if (TREE_CODE (SSA_NAME_VAR (ssa_name)) == RESULT_DECL && DECL_BY_REFERENCE (SSA_NAME_VAR (ssa_name))) { - error ("RESULT_DECL should be read only when DECL_BY_REFERENCE is set."); + error ("RESULT_DECL should be read only when DECL_BY_REFERENCE is set"); goto err; } @@ -1026,8 +1026,8 @@ verify_ssa (bool check_modified_stmt) op = gimple_op (stmt, i); if (op && TREE_CODE (op) == SSA_NAME && --count < 0) { - error ("nr of operands and imm-links don't agree"); - error ("in statement"); + error ("number of operands and imm-links don%'t agree" + " in statement"); print_gimple_stmt (stderr, stmt, 0, TDF_VOPS|TDF_MEMSYMS); goto err; } diff --git a/gcc/value-prof.c b/gcc/value-prof.c index b0cc13bb9aa..07102504232 100644 --- a/gcc/value-prof.c +++ b/gcc/value-prof.c @@ -375,7 +375,7 @@ visit_hist (void **slot, void *data) histogram_value hist = *(histogram_value *) slot; if (!pointer_set_contains (visited, hist)) { - error ("Dead histogram"); + error ("dead histogram"); dump_histogram_value (stderr, hist); debug_gimple_stmt (hist->hvalue.stmt); error_found = true; @@ -466,7 +466,7 @@ check_counter (gimple stmt, const char * name, : DECL_SOURCE_LOCATION (current_function_decl); if (flag_profile_correction) { - inform (locus, "Correcting inconsistent value profile: " + inform (locus, "correcting inconsistent value profile: " "%s profiler overall count (%d) does not match BB count " "(%d)", name, (int)*all, (int)bb_count); *all = bb_count; @@ -476,7 +476,7 @@ check_counter (gimple stmt, const char * name, } else { - error_at (locus, "Corrupted value profile: %s " + error_at (locus, "corrupted value profile: %s " "profiler overall count (%d) does not match BB count (%d)", name, (int)*all, (int)bb_count); return true; |