This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to clean up more diagnostics
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sun, 3 Jul 2005 17:28:30 +0000 (UTC)
- Subject: Patch to clean up more diagnostics
Continuing the theme of one batch of diagnostic cleanups showing where
many more diagnostics need cleaning up, this patch cleans up more
diagnostics to follow the GNU Coding Standards (no "." at end, no
capital letter at start) and not to have "\n" at end ("\n" is added by
the diagnostic machinery). Some cases of messages being printed with
fnotice to dump files (should be fprintf as such messages should not
be translated) were also fixed, as was the previously discussed issue
of toplev.c:print_version which prints a message which should be
translated when going to stderr but not when going to the .s file with
-fverbose-asm.
Bootstrapped with no regressions on x86_64-unknown-linux-gnu. OK to
commit?
--
Joseph S. Myers http://www.srcf.ucam.org/~jsm28/gcc/
jsm@polyomino.org.uk (personal mail)
joseph@codesourcery.com (CodeSourcery mail)
jsm28@gcc.gnu.org (Bugzilla assignments and CCs)
2005-07-03 Joseph S. Myers <joseph@codesourcery.com>
* bb-reorder.c, c-pch.c, c-pragma.c, c.opt, cfghooks.c, cfgloop.c,
cfgrtl.c, cgraphunit.c, config/c4x/c4x.c, config/cris/cris.c,
config/frv/frv.c, config/host-darwin.c, config/iq2000/iq2000.c,
config/lynx.h, config/m68k/m68k.c, config/pa/pa.c, config/sh/sh.h,
config/stormy16/stormy16.c, config/v850/v850.c,
config/vax/netbsd-elf.h, coverage.c, dwarf2out.c, emit-rtl.c,
except.c, gcc.c, tree-cfg.c, tree-eh.c, tree-ssa.c, xcoffout.c:
Avoid "." or "\n" at end of diagnostics and capital letters at
start of diagnostics.
* combine.c, cse.c: Don't translate dump file output.
* toplev.c (print_version): Only translate output if going to
stderr.
diff -rupN GCC.orig/gcc/bb-reorder.c GCC/gcc/bb-reorder.c
--- GCC.orig/gcc/bb-reorder.c 2005-06-28 21:46:34.000000000 +0000
+++ GCC/gcc/bb-reorder.c 2005-07-03 01:07:45.000000000 +0000
@@ -1863,7 +1863,7 @@ verify_hot_cold_block_grouping (void)
{
if (switched_sections)
{
- error ("Multiple hot/cold transitions found (bb %i)",
+ error ("multiple hot/cold transitions found (bb %i)",
bb->index);
err = 1;
}
diff -rupN GCC.orig/gcc/c-pch.c GCC/gcc/c-pch.c
--- GCC.orig/gcc/c-pch.c 2005-06-25 09:53:52.000000000 +0000
+++ GCC/gcc/c-pch.c 2005-07-03 00:11:24.000000000 +0000
@@ -464,7 +464,7 @@ c_common_pch_pragma (cpp_reader *pfile)
fd = open (name, O_RDONLY | O_BINARY, 0666);
if (fd == -1)
- fatal_error ("%s: couldn%'t open PCH file: %m\n", name);
+ fatal_error ("%s: couldn%'t open PCH file: %m", name);
if (c_common_valid_pch (pfile, name, fd) != 1)
{
diff -rupN GCC.orig/gcc/c-pragma.c GCC/gcc/c-pragma.c
--- GCC.orig/gcc/c-pragma.c 2005-07-02 10:46:13.000000000 +0000
+++ GCC/gcc/c-pragma.c 2005-07-03 01:08:33.000000000 +0000
@@ -619,7 +619,7 @@ handle_pragma_visibility (cpp_reader *du
{
if (!VEC_length (visibility, visstack))
{
- GCC_BAD ("No matching push for %<#pragma GCC visibility pop%>");
+ GCC_BAD ("no matching push for %<#pragma GCC visibility pop%>");
}
else
{
diff -rupN GCC.orig/gcc/c.opt GCC/gcc/c.opt
--- GCC.orig/gcc/c.opt 2005-07-02 13:13:42.000000000 +0000
+++ GCC/gcc/c.opt 2005-07-03 00:55:05.000000000 +0000
@@ -218,7 +218,7 @@ C ObjC C++ ObjC++ Joined
Winit-self
C ObjC C++ ObjC++ Var(warn_init_self)
-Warn about variables which are initialized to themselves.
+Warn about variables which are initialized to themselves
Wimplicit
C ObjC C++ ObjC++
@@ -233,7 +233,7 @@ Warn when a declaration does not specify
Wimport
C ObjC C++ ObjC++
-Deprecated. This switch has no effect.
+Deprecated. This switch has no effect
Wint-to-pointer-cast
C ObjC Var(warn_int_to_pointer_cast) Init(1)
diff -rupN GCC.orig/gcc/cfghooks.c GCC/gcc/cfghooks.c
--- GCC.orig/gcc/cfghooks.c 2005-06-25 09:53:52.000000000 +0000
+++ GCC/gcc/cfghooks.c 2005-07-03 01:09:09.000000000 +0000
@@ -162,7 +162,7 @@ verify_flow_info (void)
}
if (n_fallthru > 1)
{
- error ("Wrong amount of branch edges after unconditional jump %i", bb->index);
+ error ("wrong amount of branch edges after unconditional jump %i", bb->index);
err = 1;
}
@@ -285,7 +285,7 @@ redirect_edge_and_branch (edge e, basic_
edge ret;
if (!cfg_hooks->redirect_edge_and_branch)
- internal_error ("%s does not support redirect_edge_and_branch.",
+ internal_error ("%s does not support redirect_edge_and_branch",
cfg_hooks->name);
ret = cfg_hooks->redirect_edge_and_branch (e, dest);
@@ -303,7 +303,7 @@ redirect_edge_and_branch_force (edge e,
basic_block ret;
if (!cfg_hooks->redirect_edge_and_branch_force)
- internal_error ("%s does not support redirect_edge_and_branch_force.",
+ internal_error ("%s does not support redirect_edge_and_branch_force",
cfg_hooks->name);
ret = cfg_hooks->redirect_edge_and_branch_force (e, dest);
@@ -321,7 +321,7 @@ split_block (basic_block bb, void *i)
basic_block new_bb;
if (!cfg_hooks->split_block)
- internal_error ("%s does not support split_block.", cfg_hooks->name);
+ internal_error ("%s does not support split_block", cfg_hooks->name);
new_bb = cfg_hooks->split_block (bb, i);
if (!new_bb)
@@ -357,7 +357,7 @@ move_block_after (basic_block bb, basic_
bool ret;
if (!cfg_hooks->move_block_after)
- internal_error ("%s does not support move_block_after.", cfg_hooks->name);
+ internal_error ("%s does not support move_block_after", cfg_hooks->name);
ret = cfg_hooks->move_block_after (bb, after);
@@ -370,7 +370,7 @@ void
delete_basic_block (basic_block bb)
{
if (!cfg_hooks->delete_basic_block)
- internal_error ("%s does not support delete_basic_block.", cfg_hooks->name);
+ internal_error ("%s does not support delete_basic_block", cfg_hooks->name);
cfg_hooks->delete_basic_block (bb);
@@ -402,7 +402,7 @@ split_edge (edge e)
bool irr = (e->flags & EDGE_IRREDUCIBLE_LOOP) != 0;
if (!cfg_hooks->split_edge)
- internal_error ("%s does not support split_edge.", cfg_hooks->name);
+ internal_error ("%s does not support split_edge", cfg_hooks->name);
ret = cfg_hooks->split_edge (e);
ret->count = count;
@@ -463,7 +463,7 @@ create_basic_block (void *head, void *en
basic_block ret;
if (!cfg_hooks->create_basic_block)
- internal_error ("%s does not support create_basic_block.", cfg_hooks->name);
+ internal_error ("%s does not support create_basic_block", cfg_hooks->name);
ret = cfg_hooks->create_basic_block (head, end, after);
@@ -491,7 +491,7 @@ can_merge_blocks_p (basic_block bb1, bas
bool ret;
if (!cfg_hooks->can_merge_blocks_p)
- internal_error ("%s does not support can_merge_blocks_p.", cfg_hooks->name);
+ internal_error ("%s does not support can_merge_blocks_p", cfg_hooks->name);
ret = cfg_hooks->can_merge_blocks_p (bb1, bb2);
@@ -502,7 +502,7 @@ void
predict_edge (edge e, enum br_predictor predictor, int probability)
{
if (!cfg_hooks->predict_edge)
- internal_error ("%s does not support predict_edge.", cfg_hooks->name);
+ internal_error ("%s does not support predict_edge", cfg_hooks->name);
cfg_hooks->predict_edge (e, predictor, probability);
}
@@ -511,7 +511,7 @@ bool
predicted_by_p (basic_block bb, enum br_predictor predictor)
{
if (!cfg_hooks->predict_edge)
- internal_error ("%s does not support predicted_by_p.", cfg_hooks->name);
+ internal_error ("%s does not support predicted_by_p", cfg_hooks->name);
return cfg_hooks->predicted_by_p (bb, predictor);
}
@@ -525,7 +525,7 @@ merge_blocks (basic_block a, basic_block
edge_iterator ei;
if (!cfg_hooks->merge_blocks)
- internal_error ("%s does not support merge_blocks.", cfg_hooks->name);
+ internal_error ("%s does not support merge_blocks", cfg_hooks->name);
cfg_hooks->merge_blocks (a, b);
@@ -570,7 +570,7 @@ make_forwarder_block (basic_block bb, bo
basic_block dummy, jump;
if (!cfg_hooks->make_forwarder_block)
- internal_error ("%s does not support make_forwarder_block.",
+ internal_error ("%s does not support make_forwarder_block",
cfg_hooks->name);
fallthru = split_block_after_labels (bb);
@@ -675,7 +675,7 @@ can_duplicate_block_p (basic_block bb)
edge e;
if (!cfg_hooks->can_duplicate_block_p)
- internal_error ("%s does not support can_duplicate_block_p.",
+ internal_error ("%s does not support can_duplicate_block_p",
cfg_hooks->name);
if (bb == EXIT_BLOCK_PTR || bb == ENTRY_BLOCK_PTR)
@@ -702,7 +702,7 @@ duplicate_block (basic_block bb, edge e)
edge_iterator ei;
if (!cfg_hooks->duplicate_block)
- internal_error ("%s does not support duplicate_block.",
+ internal_error ("%s does not support duplicate_block",
cfg_hooks->name);
if (bb->count < new_count)
diff -rupN GCC.orig/gcc/cfgloop.c GCC/gcc/cfgloop.c
--- GCC.orig/gcc/cfgloop.c 2005-06-25 09:53:53.000000000 +0000
+++ GCC/gcc/cfgloop.c 2005-07-03 01:11:36.000000000 +0000
@@ -1085,7 +1085,7 @@ verify_loop_structure (struct loops *loo
if (loops->parray[i]->num_nodes != sizes[i])
{
- error ("Size of loop %d should be %d, not %d.",
+ error ("size of loop %d should be %d, not %d",
i, sizes[i], loops->parray[i]->num_nodes);
err = 1;
}
@@ -1102,7 +1102,7 @@ verify_loop_structure (struct loops *loo
for (j = 0; j < loop->num_nodes; j++)
if (!flow_bb_inside_loop_p (loop, bbs[j]))
{
- error ("Bb %d do not belong to loop %d.",
+ error ("bb %d do not belong to loop %d",
bbs[j]->index, i);
err = 1;
}
@@ -1119,36 +1119,36 @@ verify_loop_structure (struct loops *loo
if ((loops->state & 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 & 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 & 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;
}
}
@@ -1181,13 +1181,13 @@ verify_loop_structure (struct loops *loo
if ((bb->flags & BB_IRREDUCIBLE_LOOP)
&& !TEST_BIT (irreds, bb->index))
{
- error ("Basic block %d should be marked irreducible.", bb->index);
+ error ("basic block %d should be marked irreducible", bb->index);
err = 1;
}
else if (!(bb->flags & BB_IRREDUCIBLE_LOOP)
&& TEST_BIT (irreds, bb->index))
{
- error ("Basic block %d should not be marked irreducible.", bb->index);
+ error ("basic block %d should not be marked irreducible", bb->index);
err = 1;
}
FOR_EACH_EDGE (e, ei, bb->succs)
@@ -1195,14 +1195,14 @@ verify_loop_structure (struct loops *loo
if ((e->flags & EDGE_IRREDUCIBLE_LOOP)
&& !(e->flags & (EDGE_ALL_FLAGS + 1)))
{
- error ("Edge from %d to %d should be marked irreducible.",
+ error ("edge from %d to %d should be marked irreducible",
e->src->index, e->dest->index);
err = 1;
}
else if (!(e->flags & EDGE_IRREDUCIBLE_LOOP)
&& (e->flags & (EDGE_ALL_FLAGS + 1)))
{
- error ("Edge from %d to %d should not be marked irreducible.",
+ error ("edge from %d to %d should not be marked irreducible",
e->src->index, e->dest->index);
err = 1;
}
@@ -1237,11 +1237,11 @@ verify_loop_structure (struct loops *loo
if (loop->single_exit
&& loop->single_exit != e)
{
- error ("Wrong single exit %d->%d recorded for loop %d.",
+ error ("wrong single exit %d->%d recorded for loop %d",
loop->single_exit->src->index,
loop->single_exit->dest->index,
loop->num);
- error ("Right exit is %d->%d.",
+ error ("right exit is %d->%d",
e->src->index, e->dest->index);
err = 1;
}
@@ -1258,14 +1258,14 @@ verify_loop_structure (struct loops *loo
if (sizes[i] == 1
&& !loop->single_exit)
{
- error ("Single exit not recorded for loop %d.", loop->num);
+ error ("single exit not recorded for loop %d", loop->num);
err = 1;
}
if (sizes[i] != 1
&& loop->single_exit)
{
- error ("Loop %d should not have single exit (%d -> %d).",
+ error ("loop %d should not have single exit (%d -> %d)",
loop->num,
loop->single_exit->src->index,
loop->single_exit->dest->index);
diff -rupN GCC.orig/gcc/cfgrtl.c GCC/gcc/cfgrtl.c
--- GCC.orig/gcc/cfgrtl.c 2005-06-28 21:46:36.000000000 +0000
+++ GCC/gcc/cfgrtl.c 2005-07-03 01:10:00.000000000 +0000
@@ -1983,7 +1983,7 @@ rtl_verify_flow_info_1 (void)
&& e->src != ENTRY_BLOCK_PTR
&& e->dest != EXIT_BLOCK_PTR))
{
- error ("Fallthru edge crosses section boundary (bb %i)",
+ error ("fallthru edge crosses section boundary (bb %i)",
e->src->index);
err = 1;
}
@@ -2008,7 +2008,7 @@ rtl_verify_flow_info_1 (void)
if (n_eh && GET_CODE (PATTERN (BB_END (bb))) != RESX
&& !find_reg_note (BB_END (bb), REG_EH_REGION, NULL_RTX))
{
- error ("Missing REG_EH_REGION note in the end of bb %i", bb->index);
+ error ("missing REG_EH_REGION note in the end of bb %i", bb->index);
err = 1;
}
if (n_branch
@@ -2016,28 +2016,28 @@ rtl_verify_flow_info_1 (void)
|| (n_branch > 1 && (any_uncondjump_p (BB_END (bb))
|| any_condjump_p (BB_END (bb))))))
{
- error ("Too many outgoing branch edges from bb %i", bb->index);
+ error ("too many outgoing branch edges from bb %i", bb->index);
err = 1;
}
if (n_fallthru && any_uncondjump_p (BB_END (bb)))
{
- error ("Fallthru edge after unconditional jump %i", bb->index);
+ error ("fallthru edge after unconditional jump %i", bb->index);
err = 1;
}
if (n_branch != 1 && any_uncondjump_p (BB_END (bb)))
{
- error ("Wrong amount of branch edges after unconditional jump %i", bb->index);
+ error ("wrong amount of branch edges after unconditional jump %i", bb->index);
err = 1;
}
if (n_branch != 1 && any_condjump_p (BB_END (bb))
&& JUMP_LABEL (BB_END (bb)) == BB_HEAD (fallthru->dest))
{
- error ("Wrong amount of branch edges after conditional jump %i", bb->index);
+ error ("wrong amount of branch edges after conditional jump %i", bb->index);
err = 1;
}
if (n_call && !CALL_P (BB_END (bb)))
{
- error ("Call edges for non-call insn in bb %i", bb->index);
+ error ("call edges for non-call insn in bb %i", bb->index);
err = 1;
}
if (n_abnormal
@@ -2046,7 +2046,7 @@ rtl_verify_flow_info_1 (void)
|| any_condjump_p (BB_END (bb))
|| any_uncondjump_p (BB_END (bb))))
{
- error ("Abnormal edges for no purpose in bb %i", bb->index);
+ error ("abnormal edges for no purpose in bb %i", bb->index);
err = 1;
}
diff -rupN GCC.orig/gcc/cgraphunit.c GCC/gcc/cgraphunit.c
--- GCC.orig/gcc/cgraphunit.c 2005-06-28 21:46:37.000000000 +0000
+++ GCC/gcc/cgraphunit.c 2005-07-03 01:12:56.000000000 +0000
@@ -652,7 +652,7 @@ verify_cgraph_node (struct cgraph_node *
for (e = node->callees; e; e = e->next_callee)
if (e->aux)
{
- error ("Aux field set for edge %s->%s",
+ error ("aux field set for edge %s->%s",
cgraph_node_name (e->caller), cgraph_node_name (e->callee));
error_found = true;
}
@@ -664,30 +664,30 @@ verify_cgraph_node (struct cgraph_node *
!= (e->caller->global.inlined_to
? e->caller->global.inlined_to : e->caller))
{
- error ("Inlined_to pointer is wrong");
+ error ("inlined_to pointer is wrong");
error_found = true;
}
if (node->callers->next_caller)
{
- error ("Multiple inline callers");
+ error ("multiple inline callers");
error_found = true;
}
}
else
if (node->global.inlined_to)
{
- error ("Inlined_to pointer set for noninline callers");
+ error ("inlined_to pointer set for noninline callers");
error_found = true;
}
}
if (!node->callers && node->global.inlined_to)
{
- error ("Inlined_to pointer is set but no predecesors found");
+ error ("inlined_to pointer is set but no predecesors found");
error_found = true;
}
if (node->global.inlined_to == node)
{
- error ("Inlined_to pointer refers to itself");
+ error ("inlined_to pointer refers to itself");
error_found = true;
}
@@ -697,7 +697,7 @@ verify_cgraph_node (struct cgraph_node *
break;
if (!node)
{
- error ("Node not found in DECL_ASSEMBLER_NAME hash");
+ error ("node not found in DECL_ASSEMBLER_NAME hash");
error_found = true;
}
@@ -725,13 +725,13 @@ verify_cgraph_node (struct cgraph_node *
{
if (e->aux)
{
- error ("Shared call_stmt:");
+ error ("shared call_stmt:");
debug_generic_stmt (stmt);
error_found = true;
}
if (e->callee->decl != cgraph_node (decl)->decl)
{
- error ("Edge points to wrong declaration:");
+ error ("edge points to wrong declaration:");
debug_tree (e->callee->decl);
fprintf (stderr," Instead of:");
debug_tree (decl);
@@ -740,7 +740,7 @@ verify_cgraph_node (struct cgraph_node *
}
else
{
- error ("Missing callgraph edge for call stmt:");
+ error ("missing callgraph edge for call stmt:");
debug_generic_stmt (stmt);
error_found = true;
}
@@ -757,7 +757,7 @@ verify_cgraph_node (struct cgraph_node *
{
if (!e->aux)
{
- error ("Edge %s->%s has no corresponding call_stmt",
+ error ("edge %s->%s has no corresponding call_stmt",
cgraph_node_name (e->caller),
cgraph_node_name (e->callee));
debug_generic_stmt (e->call_stmt);
@@ -769,7 +769,7 @@ verify_cgraph_node (struct cgraph_node *
if (error_found)
{
dump_cgraph_node (stderr, node);
- internal_error ("verify_cgraph_node failed.");
+ internal_error ("verify_cgraph_node failed");
}
timevar_pop (TV_CGRAPH_VERIFY);
}
@@ -1271,7 +1271,7 @@ cgraph_optimize (void)
dump_cgraph_node (stderr, node);
}
if (error_found)
- internal_error ("Nodes with no released memory found.");
+ internal_error ("nodes with no released memory found");
}
#endif
}
diff -rupN GCC.orig/gcc/combine.c GCC/gcc/combine.c
--- GCC.orig/gcc/combine.c 2005-06-25 09:53:53.000000000 +0000
+++ GCC/gcc/combine.c 2005-07-03 00:11:35.000000000 +0000
@@ -12500,7 +12500,7 @@ insn_cuid (rtx insn)
void
dump_combine_stats (FILE *file)
{
- fnotice
+ fprintf
(file,
";; Combiner statistics: %d attempts, %d substitutions (%d requiring new space),\n;; %d successes.\n\n",
combine_attempts, combine_merges, combine_extras, combine_successes);
@@ -12509,7 +12509,7 @@ dump_combine_stats (FILE *file)
void
dump_combine_total_stats (FILE *file)
{
- fnotice
+ fprintf
(file,
"\n;; Combiner totals: %d attempts, %d substitutions (%d requiring new space),\n;; %d successes.\n",
total_attempts, total_merges, total_extras, total_successes);
diff -rupN GCC.orig/gcc/config/c4x/c4x.c GCC/gcc/config/c4x/c4x.c
--- GCC.orig/gcc/config/c4x/c4x.c 2005-07-01 19:25:41.000000000 +0000
+++ GCC/gcc/config/c4x/c4x.c 2005-07-03 00:24:10.000000000 +0000
@@ -4098,8 +4098,8 @@ c4x_rptb_rpts_p (rtx insn, rtx op)
where they are and print a warning. We should
probably move these insns before the repeat block insn. */
if (TARGET_DEBUG)
- fatal_insn("c4x_rptb_rpts_p: Repeat block top label moved\n",
- insn);
+ fatal_insn ("c4x_rptb_rpts_p: Repeat block top label moved",
+ insn);
return 0;
}
diff -rupN GCC.orig/gcc/config/cris/cris.c GCC/gcc/config/cris/cris.c
--- GCC.orig/gcc/config/cris/cris.c 2005-07-01 19:25:41.000000000 +0000
+++ GCC/gcc/config/cris/cris.c 2005-07-03 01:18:02.000000000 +0000
@@ -1470,7 +1470,7 @@ cris_notice_update_cc (rtx exp, rtx insn
break;
default:
- internal_error ("Unknown cc_attr value");
+ internal_error ("unknown cc_attr value");
}
CC_STATUS_INIT;
diff -rupN GCC.orig/gcc/config/frv/frv.c GCC/gcc/config/frv/frv.c
--- GCC.orig/gcc/config/frv/frv.c 2005-06-28 21:46:45.000000000 +0000
+++ GCC/gcc/config/frv/frv.c 2005-07-03 01:06:36.000000000 +0000
@@ -2510,7 +2510,7 @@ frv_print_operand_address (FILE * stream
break;
}
- fatal_insn ("Bad insn to frv_print_operand_address:", x);
+ fatal_insn ("bad insn to frv_print_operand_address:", x);
}
@@ -2521,7 +2521,7 @@ frv_print_operand_memory_reference_reg (
if (GPR_P (regno))
fputs (reg_names[regno], stream);
else
- fatal_insn ("Bad register to frv_print_operand_memory_reference_reg:", x);
+ fatal_insn ("bad register to frv_print_operand_memory_reference_reg:", x);
}
/* Print a memory reference suitable for the ld/st instructions. */
@@ -2560,7 +2560,7 @@ frv_print_operand_memory_reference (FILE
break;
default:
- fatal_insn ("Bad insn to frv_print_operand_memory_reference:", x);
+ fatal_insn ("bad insn to frv_print_operand_memory_reference:", x);
break;
}
@@ -2570,7 +2570,7 @@ frv_print_operand_memory_reference (FILE
if (!x1)
x1 = const0_rtx;
else if (GET_CODE (x1) != CONST_INT)
- fatal_insn ("Bad insn to frv_print_operand_memory_reference:", x);
+ fatal_insn ("bad insn to frv_print_operand_memory_reference:", x);
}
fputs ("@(", stream);
@@ -2579,7 +2579,7 @@ frv_print_operand_memory_reference (FILE
else if (GET_CODE (x0) == REG || GET_CODE (x0) == SUBREG)
frv_print_operand_memory_reference_reg (stream, x0);
else
- fatal_insn ("Bad insn to frv_print_operand_memory_reference:", x);
+ fatal_insn ("bad insn to frv_print_operand_memory_reference:", x);
fputs (",", stream);
if (!x1)
@@ -2600,12 +2600,12 @@ frv_print_operand_memory_reference (FILE
case CONST:
if (!frv_const_unspec_p (x1, &unspec))
- fatal_insn ("Bad insn to frv_print_operand_memory_reference:", x1);
+ fatal_insn ("bad insn to frv_print_operand_memory_reference:", x1);
frv_output_const_unspec (stream, &unspec);
break;
default:
- fatal_insn ("Bad insn to frv_print_operand_memory_reference:", x);
+ fatal_insn ("bad insn to frv_print_operand_memory_reference:", x);
}
}
@@ -2766,7 +2766,7 @@ frv_print_operand (FILE * file, rtx x, i
value = CONST_DOUBLE_LOW (x);
else
- fatal_insn ("Bad insn in frv_print_operand, bad const_double", x);
+ fatal_insn ("bad insn in frv_print_operand, bad const_double", x);
}
else
@@ -2827,7 +2827,7 @@ frv_print_operand (FILE * file, rtx x, i
fputs ("0", file);
else
- fatal_insn ("Bad insn to frv_print_operand, 'e' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'e' modifier:", x);
break;
case 'F':
@@ -2835,7 +2835,7 @@ frv_print_operand (FILE * file, rtx x, i
switch (GET_CODE (x))
{
default:
- fatal_insn ("Bad insn to frv_print_operand, 'F' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'F' modifier:", x);
case EQ: fputs ("ne", file); break;
case NE: fputs ("eq", file); break;
@@ -2851,7 +2851,7 @@ frv_print_operand (FILE * file, rtx x, i
switch (GET_CODE (x))
{
default:
- fatal_insn ("Bad insn to frv_print_operand, 'f' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'f' modifier:", x);
case EQ: fputs ("eq", file); break;
case NE: fputs ("ne", file); break;
@@ -2865,7 +2865,7 @@ frv_print_operand (FILE * file, rtx x, i
case 'g':
/* Print appropriate GOT function. */
if (GET_CODE (x) != CONST_INT)
- fatal_insn ("Bad insn to frv_print_operand, 'g' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'g' modifier:", x);
fputs (unspec_got_name (INTVAL (x)), file);
break;
@@ -2913,7 +2913,7 @@ frv_print_operand (FILE * file, rtx x, i
if (GET_CODE (x) == REG)
fputs (reg_names[ REGNO (x)+1 ], file);
else
- fatal_insn ("Bad insn to frv_print_operand, 'L' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'L' modifier:", x);
break;
/* case 'l': print a LABEL_REF. */
@@ -2926,7 +2926,7 @@ frv_print_operand (FILE * file, rtx x, i
switch (GET_CODE (x))
{
default:
- fatal_insn ("Bad insn to frv_print_operand, 'M/N' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'M/N' modifier:", x);
case MEM:
frv_print_operand_memory_reference (file, XEXP (x, 0), offset);
@@ -2947,7 +2947,7 @@ frv_print_operand (FILE * file, rtx x, i
switch (GET_CODE (x))
{
default:
- fatal_insn ("Bad insn to frv_print_operand, 'O' modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, 'O' modifier:", x);
case PLUS: fputs ("add", file); break;
case MINUS: fputs ("sub", file); break;
@@ -2965,7 +2965,7 @@ frv_print_operand (FILE * file, rtx x, i
case 'P':
/* Print PIC label using operand as the number. */
if (GET_CODE (x) != CONST_INT)
- fatal_insn ("Bad insn to frv_print_operand, P modifier:", x);
+ fatal_insn ("bad insn to frv_print_operand, P modifier:", x);
fprintf (file, ".LCF%ld", (long)INTVAL (x));
break;
@@ -2985,7 +2985,7 @@ frv_print_operand (FILE * file, rtx x, i
fputs (reg_names [REGNO (x)], file);
else
- fatal_insn ("Bad insn in frv_print_operand, z case", x);
+ fatal_insn ("bad insn in frv_print_operand, z case", x);
break;
case 'x':
@@ -3016,7 +3016,7 @@ frv_print_operand (FILE * file, rtx x, i
frv_print_operand_address (file, x);
else
- fatal_insn ("Bad insn in frv_print_operand, 0 case", x);
+ fatal_insn ("bad insn in frv_print_operand, 0 case", x);
break;
@@ -4390,7 +4390,7 @@ output_move_single (rtx operands[], rtx
}
}
- fatal_insn ("Bad output_move_single operand", insn);
+ fatal_insn ("bad output_move_single operand", insn);
return "";
}
@@ -4517,7 +4517,7 @@ output_move_double (rtx operands[], rtx
}
}
- fatal_insn ("Bad output_move_double operand", insn);
+ fatal_insn ("bad output_move_double operand", insn);
return "";
}
@@ -4659,7 +4659,7 @@ output_condmove_single (rtx operands[],
}
}
- fatal_insn ("Bad output_condmove_single operand", insn);
+ fatal_insn ("bad output_condmove_single operand", insn);
return "";
}
diff -rupN GCC.orig/gcc/config/host-darwin.c GCC/gcc/config/host-darwin.c
--- GCC.orig/gcc/config/host-darwin.c 2005-06-25 09:54:15.000000000 +0000
+++ GCC/gcc/config/host-darwin.c 2005-07-03 00:23:36.000000000 +0000
@@ -60,7 +60,7 @@ darwin_gt_pch_use_address (void *addr, s
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\n");
+ fatal_error ("couldn't unmap pch_address_space: %m");
if (ret)
{
diff -rupN GCC.orig/gcc/config/iq2000/iq2000.c GCC/gcc/config/iq2000/iq2000.c
--- GCC.orig/gcc/config/iq2000/iq2000.c 2005-06-25 09:54:31.000000000 +0000
+++ GCC/gcc/config/iq2000/iq2000.c 2005-07-03 01:02:40.000000000 +0000
@@ -1805,7 +1805,7 @@ save_restore_insns (int store_p)
if (gp_offset < 0 || end_offset < 0)
internal_error
- ("gp_offset (%ld) or end_offset (%ld) is less than zero.",
+ ("gp_offset (%ld) or end_offset (%ld) is less than zero",
(long) gp_offset, (long) end_offset);
else if (gp_offset < 32768)
diff -rupN GCC.orig/gcc/config/lynx.h GCC/gcc/config/lynx.h
--- GCC.orig/gcc/config/lynx.h 2005-06-25 09:54:15.000000000 +0000
+++ GCC/gcc/config/lynx.h 2005-07-03 00:54:19.000000000 +0000
@@ -68,7 +68,7 @@ Boston, MA 02110-1301, USA. */
# define CPP_OS_LYNX_SPEC \
"%{mthreads: \
%{mlegacy-threads: \
- %eCannot use mthreads and mlegacy-threads together.}} \
+ %ecannot use mthreads and mlegacy-threads together}} \
%{mthreads: -D_MULTITHREADED} \
%{mlegacy-threads: -D_THREADS_POSIX4ad4} \
-Asystem=lynx -Asystem=unix -D__Lynx__ -D__unix__"
@@ -93,7 +93,7 @@ Boston, MA 02110-1301, USA. */
#ifndef LINK_OS_LYNX_SPEC
# define LINK_OS_LYNX_SPEC \
"%{shared} %{static} \
- %{mshared: %{static: %eCannot use mshared and static together.}} \
+ %{mshared: %{static: %ecannot use mshared and static together}} \
%{!mshared: %{!shared: %{!static: -static}}} \
%{L*} \
%{mthreads: \
diff -rupN GCC.orig/gcc/config/m68k/m68k.c GCC/gcc/config/m68k/m68k.c
--- GCC.orig/gcc/config/m68k/m68k.c 2005-06-25 09:54:33.000000000 +0000
+++ GCC/gcc/config/m68k/m68k.c 2005-07-03 00:24:55.000000000 +0000
@@ -330,7 +330,7 @@ override_options (void)
/* -fPIC uses 32-bit pc-relative displacements, which don't exist
until the 68020. */
if (!TARGET_68020 && !TARGET_COLDFIRE && (flag_pic == 2))
- error("-fPIC is not currently supported on the 68000 or 68010\n");
+ error ("-fPIC is not currently supported on the 68000 or 68010");
/* ??? A historic way of turning on pic, or is this intended to
be an embedded thing that doesn't have the same name binding
diff -rupN GCC.orig/gcc/config/pa/pa.c GCC/gcc/config/pa/pa.c
--- GCC.orig/gcc/config/pa/pa.c 2005-06-25 09:54:34.000000000 +0000
+++ GCC/gcc/config/pa/pa.c 2005-07-03 00:25:24.000000000 +0000
@@ -449,12 +449,12 @@ override_options (void)
if (flag_pic && TARGET_PORTABLE_RUNTIME)
{
- warning (0, "PIC code generation is not supported in the portable runtime model\n");
+ warning (0, "PIC code generation is not supported in the portable runtime model");
}
if (flag_pic && TARGET_FAST_INDIRECT_CALLS)
{
- warning (0, "PIC code generation is not compatible with fast indirect calls\n");
+ warning (0, "PIC code generation is not compatible with fast indirect calls");
}
if (! TARGET_GAS && write_symbols != NO_DEBUG)
diff -rupN GCC.orig/gcc/config/sh/sh.h GCC/gcc/config/sh/sh.h
--- GCC.orig/gcc/config/sh/sh.h 2005-06-29 09:44:31.000000000 +0000
+++ GCC/gcc/config/sh/sh.h 2005-07-03 01:03:26.000000000 +0000
@@ -604,7 +604,7 @@ do { \
--with-newlib --with-headers. But there is no way to check \
here we have a working libgcov, so just assume that we have. */\
if (profile_flag) \
- warning (0, "Profiling is still experimental for this target.");\
+ warning (0, "profiling is still experimental for this target");\
} \
else \
{ \
diff -rupN GCC.orig/gcc/config/stormy16/stormy16.c GCC/gcc/config/stormy16/stormy16.c
--- GCC.orig/gcc/config/stormy16/stormy16.c 2005-06-25 09:54:41.000000000 +0000
+++ GCC/gcc/config/stormy16/stormy16.c 2005-07-03 01:04:20.000000000 +0000
@@ -494,7 +494,7 @@ xs_hi_general_operand (rtx x, enum machi
{
if ((GET_CODE (x) == CONST_INT)
&& ((INTVAL (x) >= 32768) || (INTVAL (x) < -32768)))
- error ("Constant halfword load operand out of range.");
+ error ("constant halfword load operand out of range");
return general_operand (x, mode);
}
@@ -504,7 +504,7 @@ xs_hi_nonmemory_operand (rtx x, enum mac
{
if ((GET_CODE (x) == CONST_INT)
&& ((INTVAL (x) >= 32768) || (INTVAL (x) < -32768)))
- error ("Constant arithmetic operand out of range.");
+ error ("constant arithmetic operand out of range");
return nonmemory_operand (x, mode);
}
@@ -1107,7 +1107,7 @@ xstormy16_expand_prologue (void)
layout = xstormy16_compute_stack_layout ();
if (layout.locals_size >= 32768)
- error ("Local variable memory requirements exceed capacity.");
+ error ("local variable memory requirements exceed capacity");
/* Save the argument registers if necessary. */
if (layout.stdarg_save_size)
@@ -2306,7 +2306,7 @@ xstormy16_handle_below100_attribute (tre
if (! (TREE_PUBLIC (*node) || TREE_STATIC (*node)))
{
warning (OPT_Wattributes, "__BELOW100__ attribute not allowed "
- "with auto storage class.");
+ "with auto storage class");
*no_add_attrs = true;
}
}
diff -rupN GCC.orig/gcc/config/v850/v850.c GCC/gcc/config/v850/v850.c
--- GCC.orig/gcc/config/v850/v850.c 2005-07-02 23:52:45.000000000 +0000
+++ GCC/gcc/config/v850/v850.c 2005-07-03 00:26:06.000000000 +0000
@@ -2278,7 +2278,7 @@ construct_restore_jr (rtx op)
if (count <= 2)
{
- error ("bogus JR construction: %d\n", count);
+ error ("bogus JR construction: %d", count);
return NULL;
}
@@ -2684,7 +2684,7 @@ construct_dispose_instruction (rtx op)
if (count <= 2)
{
- error ("Bogus DISPOSE construction: %d\n", count);
+ error ("bogus DISPOSE construction: %d", count);
return NULL;
}
@@ -2703,7 +2703,7 @@ construct_dispose_instruction (rtx op)
will fit into the DISPOSE instruction. */
if (stack_bytes > 128)
{
- error ("Too much stack space to dispose of: %d", stack_bytes);
+ error ("too much stack space to dispose of: %d", stack_bytes);
return NULL;
}
@@ -2805,7 +2805,7 @@ construct_prepare_instruction (rtx op)
if (count <= 1)
{
- error ("Bogus PREPEARE construction: %d\n", count);
+ error ("bogus PREPEARE construction: %d", count);
return NULL;
}
@@ -2824,7 +2824,7 @@ construct_prepare_instruction (rtx op)
will fit into the DISPOSE instruction. */
if (stack_bytes < -128)
{
- error ("Too much stack space to prepare: %d", stack_bytes);
+ error ("too much stack space to prepare: %d", stack_bytes);
return NULL;
}
diff -rupN GCC.orig/gcc/config/vax/netbsd-elf.h GCC/gcc/config/vax/netbsd-elf.h
--- GCC.orig/gcc/config/vax/netbsd-elf.h 2005-06-25 09:54:42.000000000 +0000
+++ GCC/gcc/config/vax/netbsd-elf.h 2005-07-03 00:54:28.000000000 +0000
@@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA. */
is added to the compiler. */
#define LINK_SPEC \
"%{assert*} %{R*} %{rpath*} \
- %{shared:%eThe -shared option is not currently supported for VAX ELF.} \
+ %{shared:%ethe -shared option is not currently supported for VAX ELF} \
%{!shared: \
-dc -dp \
%{!nostdlib: \
diff -rupN GCC.orig/gcc/coverage.c GCC/gcc/coverage.c
--- GCC.orig/gcc/coverage.c 2005-06-25 09:53:54.000000000 +0000
+++ GCC/gcc/coverage.c 2005-07-03 00:56:58.000000000 +0000
@@ -271,7 +271,7 @@ read_counts_file (void)
}
else if (entry->checksum != checksum)
{
- error ("coverage mismatch for function %u while reading execution counters.",
+ error ("coverage mismatch for function %u while reading execution counters",
fn_ident);
error ("checksum is %x instead of %x", entry->checksum, checksum);
htab_delete (counts_hash);
@@ -279,7 +279,7 @@ read_counts_file (void)
}
else if (entry->summary.num != n_counts)
{
- error ("coverage mismatch for function %u while reading execution counters.",
+ error ("coverage mismatch for function %u while reading execution counters",
fn_ident);
error ("number of counters is %d instead of %d", entry->summary.num, n_counts);
htab_delete (counts_hash);
@@ -345,7 +345,7 @@ get_coverage_counts (unsigned counter, u
entry = htab_find (counts_hash, &elt);
if (!entry)
{
- warning (0, "no coverage for function %qs found.", IDENTIFIER_POINTER
+ warning (0, "no coverage for function %qs found", IDENTIFIER_POINTER
(DECL_ASSEMBLER_NAME (current_function_decl)));
return 0;
}
@@ -353,7 +353,7 @@ get_coverage_counts (unsigned counter, u
checksum = compute_checksum ();
if (entry->checksum != checksum)
{
- error ("coverage mismatch for function %qs while reading counter %qs.",
+ error ("coverage mismatch for function %qs while reading counter %qs",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)),
ctr_names[counter]);
error ("checksum is %x instead of %x", entry->checksum, checksum);
@@ -361,7 +361,7 @@ get_coverage_counts (unsigned counter, u
}
else if (entry->summary.num != expected)
{
- error ("coverage mismatch for function %qs while reading counter %qs.",
+ error ("coverage mismatch for function %qs while reading counter %qs",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)),
ctr_names[counter]);
error ("number of counters is %d instead of %d", entry->summary.num, expected);
diff -rupN GCC.orig/gcc/cse.c GCC/gcc/cse.c
--- GCC.orig/gcc/cse.c 2005-06-25 09:53:54.000000000 +0000
+++ GCC/gcc/cse.c 2005-07-03 00:11:44.000000000 +0000
@@ -6799,7 +6799,7 @@ cse_main (rtx f, int nregs, FILE *file)
max_qty = val.nsets * 2;
if (file)
- fnotice (file, ";; Processing block from %d to %d, %d sets.\n",
+ fprintf (file, ";; Processing block from %d to %d, %d sets.\n",
INSN_UID (insn), val.last ? INSN_UID (val.last) : 0,
val.nsets);
diff -rupN GCC.orig/gcc/dwarf2out.c GCC/gcc/dwarf2out.c
--- GCC.orig/gcc/dwarf2out.c 2005-07-01 19:24:45.000000000 +0000
+++ GCC/gcc/dwarf2out.c 2005-07-03 00:11:52.000000000 +0000
@@ -3448,7 +3448,7 @@ get_cfa_from_loc_descr (dw_cfa_location
cfa->offset = ptr->dw_loc_oprnd1.v.val_unsigned;
break;
default:
- internal_error ("DW_LOC_OP %s not implemented\n",
+ internal_error ("DW_LOC_OP %s not implemented",
dwarf_stack_op_name (ptr->dw_loc_opc));
}
}
diff -rupN GCC.orig/gcc/emit-rtl.c GCC/gcc/emit-rtl.c
--- GCC.orig/gcc/emit-rtl.c 2005-06-25 09:53:55.000000000 +0000
+++ GCC/gcc/emit-rtl.c 2005-07-03 01:13:31.000000000 +0000
@@ -2198,11 +2198,11 @@ verify_rtx_sharing (rtx orig, rtx insn)
#ifdef ENABLE_CHECKING
if (RTX_FLAG (x, used))
{
- error ("Invalid rtl sharing found in the insn");
+ error ("invalid rtl sharing found in the insn");
debug_rtx (insn);
- error ("Shared rtx");
+ error ("shared rtx");
debug_rtx (x);
- internal_error ("Internal consistency failure");
+ internal_error ("internal consistency failure");
}
#endif
gcc_assert (!RTX_FLAG (x, used));
diff -rupN GCC.orig/gcc/except.c GCC/gcc/except.c
--- GCC.orig/gcc/except.c 2005-06-28 21:46:37.000000000 +0000
+++ GCC/gcc/except.c 2005-07-03 00:57:37.000000000 +0000
@@ -3746,7 +3746,7 @@ verify_eh_tree (struct function *fun)
{
if (depth != -1)
{
- error ("Tree list ends on depth %i", depth + 1);
+ error ("tree list ends on depth %i", depth + 1);
err = true;
}
if (count != nvisited)
@@ -3757,7 +3757,7 @@ verify_eh_tree (struct function *fun)
if (err)
{
dump_eh_tree (stderr, fun);
- internal_error ("verify_eh_tree failed.");
+ internal_error ("verify_eh_tree failed");
}
return;
}
diff -rupN GCC.orig/gcc/gcc.c GCC/gcc/gcc.c
--- GCC.orig/gcc/gcc.c 2005-07-02 10:43:38.000000000 +0000
+++ GCC/gcc/gcc.c 2005-07-03 00:58:21.000000000 +0000
@@ -6156,7 +6156,7 @@ main (int argc, const char **argv)
&& do_spec_2 (sysroot_suffix_spec) == 0)
{
if (argbuf_index > 1)
- error ("spec failure: more than one arg to SYSROOT_SUFFIX_SPEC.");
+ error ("spec failure: more than one arg to SYSROOT_SUFFIX_SPEC");
else if (argbuf_index == 1)
target_sysroot_suffix = xstrdup (argbuf[argbuf_index -1]);
}
@@ -6179,7 +6179,7 @@ main (int argc, const char **argv)
&& do_spec_2 (sysroot_hdrs_suffix_spec) == 0)
{
if (argbuf_index > 1)
- error ("spec failure: more than one arg to SYSROOT_HEADERS_SUFFIX_SPEC.");
+ error ("spec failure: more than one arg to SYSROOT_HEADERS_SUFFIX_SPEC");
else if (argbuf_index == 1)
target_sysroot_hdrs_suffix = xstrdup (argbuf[argbuf_index -1]);
}
diff -rupN GCC.orig/gcc/toplev.c GCC/gcc/toplev.c
--- GCC.orig/gcc/toplev.c 2005-07-02 10:46:14.000000000 +0000
+++ GCC/gcc/toplev.c 2005-07-03 13:07:36.000000000 +0000
@@ -1093,19 +1093,25 @@ const char *const debug_type_names[] =
void
print_version (FILE *file, const char *indent)
{
-#ifndef __VERSION__
-#define __VERSION__ "[?]"
-#endif
- fnotice (file,
+ static const char fmt1[] =
#ifdef __GNUC__
- "%s%s%s version %s (%s)\n%s\tcompiled by GNU C version %s.\n"
+ N_("%s%s%s version %s (%s)\n%s\tcompiled by GNU C version %s.\n")
#else
- "%s%s%s version %s (%s) compiled by CC.\n"
+ N_("%s%s%s version %s (%s) compiled by CC.\n")
+#endif
+ ;
+ static const char fmt2[] =
+ N_("%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n");
+#ifndef __VERSION__
+#define __VERSION__ "[?]"
#endif
- , indent, *indent != 0 ? " " : "",
+ fprintf (file,
+ file == stderr ? _(fmt1) : fmt1,
+ indent, *indent != 0 ? " " : "",
lang_hooks.name, version_string, TARGET_NAME,
indent, __VERSION__);
- fnotice (file, "%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n",
+ fprintf (file,
+ file == stderr ? _(fmt2) : fmt2,
indent, *indent != 0 ? " " : "",
PARAM_VALUE (GGC_MIN_EXPAND), PARAM_VALUE (GGC_MIN_HEAPSIZE));
}
diff -rupN GCC.orig/gcc/tree-cfg.c GCC/gcc/tree-cfg.c
--- GCC.orig/gcc/tree-cfg.c 2005-06-28 21:46:40.000000000 +0000
+++ GCC/gcc/tree-cfg.c 2005-07-03 01:16:17.000000000 +0000
@@ -3187,7 +3187,7 @@ verify_expr (tree *tp, int *walk_subtree
}
if (!is_gimple_condexpr (x))
{
- error ("Invalid conditional operand");
+ error ("invalid conditional operand");
return x;
}
break;
@@ -3204,7 +3204,7 @@ verify_expr (tree *tp, int *walk_subtree
case BIT_NOT_EXPR:
case NON_LVALUE_EXPR:
case TRUTH_NOT_EXPR:
- CHECK_OP (0, "Invalid operand to unary operator");
+ CHECK_OP (0, "invalid operand to unary operator");
break;
case REALPART_EXPR:
@@ -3221,20 +3221,20 @@ verify_expr (tree *tp, int *walk_subtree
while (handled_component_p (t))
{
if (TREE_CODE (t) == COMPONENT_REF && TREE_OPERAND (t, 2))
- CHECK_OP (2, "Invalid COMPONENT_REF offset operator");
+ CHECK_OP (2, "invalid COMPONENT_REF offset operator");
else if (TREE_CODE (t) == ARRAY_REF
|| TREE_CODE (t) == ARRAY_RANGE_REF)
{
- CHECK_OP (1, "Invalid array index.");
+ CHECK_OP (1, "invalid array index");
if (TREE_OPERAND (t, 2))
- CHECK_OP (2, "Invalid array lower bound.");
+ CHECK_OP (2, "invalid array lower bound");
if (TREE_OPERAND (t, 3))
- CHECK_OP (3, "Invalid array stride.");
+ CHECK_OP (3, "invalid array stride");
}
else if (TREE_CODE (t) == BIT_FIELD_REF)
{
- CHECK_OP (1, "Invalid operand to BIT_FIELD_REF");
- CHECK_OP (2, "Invalid operand to BIT_FIELD_REF");
+ CHECK_OP (1, "invalid operand to BIT_FIELD_REF");
+ CHECK_OP (2, "invalid operand to BIT_FIELD_REF");
}
t = TREE_OPERAND (t, 0);
@@ -3242,7 +3242,7 @@ verify_expr (tree *tp, int *walk_subtree
if (!CONSTANT_CLASS_P (t) && !is_gimple_lvalue (t))
{
- error ("Invalid reference prefix.");
+ error ("invalid reference prefix");
return t;
}
*walk_subtrees = 0;
@@ -3284,8 +3284,8 @@ verify_expr (tree *tp, int *walk_subtree
case BIT_IOR_EXPR:
case BIT_XOR_EXPR:
case BIT_AND_EXPR:
- CHECK_OP (0, "Invalid operand to binary operator");
- CHECK_OP (1, "Invalid operand to binary operator");
+ CHECK_OP (0, "invalid operand to binary operator");
+ CHECK_OP (1, "invalid operand to binary operator");
break;
default:
@@ -3307,7 +3307,7 @@ verify_stmt (tree stmt, bool last_in_blo
if (!is_gimple_stmt (stmt))
{
- error ("Is not a valid GIMPLE statement.");
+ error ("is not a valid GIMPLE statement");
goto fail;
}
@@ -3327,12 +3327,12 @@ verify_stmt (tree stmt, bool last_in_blo
{
if (!tree_could_throw_p (stmt))
{
- error ("Statement marked for throw, but doesn%'t.");
+ error ("statement marked for throw, but doesn%'t");
goto fail;
}
if (!last_in_block && tree_can_throw_internal (stmt))
{
- error ("Statement marked for throw in middle of block.");
+ error ("statement marked for throw in middle of block");
goto fail;
}
}
@@ -3427,7 +3427,7 @@ verify_stmts (void)
if (bb_for_stmt (phi) != bb)
{
- error ("bb_for_stmt (phi) is set to a wrong basic block\n");
+ error ("bb_for_stmt (phi) is set to a wrong basic block");
err |= true;
}
@@ -3458,7 +3458,7 @@ verify_stmts (void)
addr = walk_tree (&t, verify_node_sharing, htab, NULL);
if (addr)
{
- error ("Incorrect sharing of tree nodes");
+ error ("incorrect sharing of tree nodes");
debug_generic_stmt (phi);
debug_generic_stmt (addr);
err |= true;
@@ -3472,7 +3472,7 @@ verify_stmts (void)
if (bb_for_stmt (stmt) != bb)
{
- error ("bb_for_stmt (stmt) is set to a wrong basic block\n");
+ error ("bb_for_stmt (stmt) is set to a wrong basic block");
err |= true;
}
@@ -3481,7 +3481,7 @@ verify_stmts (void)
addr = walk_tree (&stmt, verify_node_sharing, htab, NULL);
if (addr)
{
- error ("Incorrect sharing of tree nodes");
+ error ("incorrect sharing of tree nodes");
debug_generic_stmt (stmt);
debug_generic_stmt (addr);
err |= true;
@@ -3490,7 +3490,7 @@ verify_stmts (void)
}
if (err)
- internal_error ("verify_stmts failed.");
+ internal_error ("verify_stmts failed");
htab_delete (htab);
timevar_pop (TV_TREE_STMT_VERIFY);
@@ -3511,20 +3511,20 @@ tree_verify_flow_info (void)
if (ENTRY_BLOCK_PTR->stmt_list)
{
- error ("ENTRY_BLOCK has a statement list associated with it\n");
+ error ("ENTRY_BLOCK has a statement list associated with it");
err = 1;
}
if (EXIT_BLOCK_PTR->stmt_list)
{
- error ("EXIT_BLOCK has a statement list associated with it\n");
+ error ("EXIT_BLOCK has a statement list associated with it");
err = 1;
}
FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
if (e->flags & EDGE_FALLTHRU)
{
- error ("Fallthru to exit from bb %d\n", e->src->index);
+ error ("fallthru to exit from bb %d", e->src->index);
err = 1;
}
@@ -3546,7 +3546,7 @@ tree_verify_flow_info (void)
if (prev_stmt && DECL_NONLOCAL (LABEL_EXPR_LABEL (stmt)))
{
- error ("Nonlocal label %s is not first "
+ error ("nonlocal label %s is not first "
"in a sequence of labels in bb %d",
IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
bb->index);
@@ -3555,7 +3555,7 @@ tree_verify_flow_info (void)
if (label_to_block (LABEL_EXPR_LABEL (stmt)) != bb)
{
- error ("Label %s to block does not match in bb %d\n",
+ error ("label %s to block does not match in bb %d",
IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
bb->index);
err = 1;
@@ -3564,7 +3564,7 @@ tree_verify_flow_info (void)
if (decl_function_context (LABEL_EXPR_LABEL (stmt))
!= current_function_decl)
{
- error ("Label %s has incorrect context in bb %d\n",
+ error ("label %s has incorrect context in bb %d",
IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
bb->index);
err = 1;
@@ -3578,7 +3578,7 @@ tree_verify_flow_info (void)
if (found_ctrl_stmt)
{
- error ("Control flow in the middle of basic block %d\n",
+ error ("control flow in the middle of basic block %d",
bb->index);
err = 1;
}
@@ -3588,7 +3588,7 @@ tree_verify_flow_info (void)
if (TREE_CODE (stmt) == LABEL_EXPR)
{
- error ("Label %s in the middle of basic block %d\n",
+ error ("label %s in the middle of basic block %d",
IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
bb->index);
err = 1;
@@ -3607,7 +3607,7 @@ tree_verify_flow_info (void)
FOR_EACH_EDGE (e, ei, bb->succs)
if (e->flags & EDGE_FALLTHRU)
{
- error ("Fallthru edge after a control statement in bb %d \n",
+ error ("fallthru edge after a control statement in bb %d",
bb->index);
err = 1;
}
@@ -3622,7 +3622,7 @@ tree_verify_flow_info (void)
if (TREE_CODE (COND_EXPR_THEN (stmt)) != GOTO_EXPR
|| TREE_CODE (COND_EXPR_ELSE (stmt)) != GOTO_EXPR)
{
- error ("Structured COND_EXPR at the end of bb %d\n", bb->index);
+ error ("structured COND_EXPR at the end of bb %d", bb->index);
err = 1;
}
@@ -3635,7 +3635,7 @@ tree_verify_flow_info (void)
|| (false_edge->flags & (EDGE_FALLTHRU | EDGE_ABNORMAL))
|| EDGE_COUNT (bb->succs) >= 3)
{
- error ("Wrong outgoing edge flags at end of bb %d\n",
+ error ("wrong outgoing edge flags at end of bb %d",
bb->index);
err = 1;
}
@@ -3643,7 +3643,7 @@ tree_verify_flow_info (void)
if (!has_label_p (true_edge->dest,
GOTO_DESTINATION (COND_EXPR_THEN (stmt))))
{
- error ("%<then%> label does not match edge at end of bb %d\n",
+ error ("%<then%> label does not match edge at end of bb %d",
bb->index);
err = 1;
}
@@ -3651,7 +3651,7 @@ tree_verify_flow_info (void)
if (!has_label_p (false_edge->dest,
GOTO_DESTINATION (COND_EXPR_ELSE (stmt))))
{
- error ("%<else%> label does not match edge at end of bb %d\n",
+ error ("%<else%> label does not match edge at end of bb %d",
bb->index);
err = 1;
}
@@ -3661,7 +3661,7 @@ tree_verify_flow_info (void)
case GOTO_EXPR:
if (simple_goto_p (stmt))
{
- error ("Explicit goto at end of bb %d\n", bb->index);
+ error ("explicit goto at end of bb %d", bb->index);
err = 1;
}
else
@@ -3673,7 +3673,7 @@ tree_verify_flow_info (void)
| EDGE_FALSE_VALUE))
|| !(e->flags & EDGE_ABNORMAL))
{
- error ("Wrong outgoing edge flags at end of bb %d\n",
+ error ("wrong outgoing edge flags at end of bb %d",
bb->index);
err = 1;
}
@@ -3686,12 +3686,12 @@ tree_verify_flow_info (void)
& (EDGE_FALLTHRU | EDGE_ABNORMAL
| EDGE_TRUE_VALUE | EDGE_FALSE_VALUE)))
{
- error ("Wrong outgoing edge flags at end of bb %d\n", bb->index);
+ error ("wrong outgoing edge flags at end of bb %d", bb->index);
err = 1;
}
if (single_succ (bb) != EXIT_BLOCK_PTR)
{
- error ("Return edge does not point to exit in bb %d\n",
+ error ("return edge does not point to exit in bb %d",
bb->index);
err = 1;
}
@@ -3724,13 +3724,13 @@ tree_verify_flow_info (void)
tree c = TREE_VEC_ELT (vec, i);
if (! CASE_LOW (c))
{
- error ("Found default case not at end of case vector");
+ error ("found default case not at end of case vector");
err = 1;
continue;
}
if (! tree_int_cst_lt (CASE_LOW (prev), CASE_LOW (c)))
{
- error ("Case labels not sorted:\n ");
+ error ("case labels not sorted:");
print_generic_expr (stderr, prev, 0);
fprintf (stderr," is greater than ");
print_generic_expr (stderr, c, 0);
@@ -3741,7 +3741,7 @@ tree_verify_flow_info (void)
}
if (CASE_LOW (TREE_VEC_ELT (vec, n - 1)))
{
- error ("No default case found at end of case vector");
+ error ("no default case found at end of case vector");
err = 1;
}
@@ -3749,7 +3749,7 @@ tree_verify_flow_info (void)
{
if (!e->dest->aux)
{
- error ("Extra outgoing edge %d->%d\n",
+ error ("extra outgoing edge %d->%d",
bb->index, e->dest->index);
err = 1;
}
@@ -3757,7 +3757,7 @@ tree_verify_flow_info (void)
if ((e->flags & (EDGE_FALLTHRU | EDGE_ABNORMAL
| EDGE_TRUE_VALUE | EDGE_FALSE_VALUE)))
{
- error ("Wrong outgoing edge flags at end of bb %d\n",
+ error ("wrong outgoing edge flags at end of bb %d",
bb->index);
err = 1;
}
@@ -3771,7 +3771,7 @@ tree_verify_flow_info (void)
if (label_bb->aux != (void *)2)
{
- error ("Missing edge %i->%i",
+ error ("missing edge %i->%i",
bb->index, label_bb->index);
err = 1;
}
diff -rupN GCC.orig/gcc/tree-eh.c GCC/gcc/tree-eh.c
--- GCC.orig/gcc/tree-eh.c 2005-07-03 00:31:58.000000000 +0000
+++ GCC/gcc/tree-eh.c 2005-07-03 01:16:37.000000000 +0000
@@ -1764,18 +1764,18 @@ mark_eh_edge (struct eh_region *region,
e = find_edge (src, dst);
if (!e)
{
- error ("EH edge %i->%i is missing.", src->index, dst->index);
+ error ("EH edge %i->%i is missing", src->index, dst->index);
mark_eh_edge_found_error = true;
}
else if (!(e->flags & EDGE_EH))
{
- error ("EH edge %i->%i miss EH flag.", src->index, dst->index);
+ error ("EH edge %i->%i miss EH flag", src->index, dst->index);
mark_eh_edge_found_error = true;
}
else if (e->aux)
{
/* ??? might not be mistake. */
- error ("EH edge %i->%i has duplicated regions.", src->index, dst->index);
+ error ("EH edge %i->%i has duplicated regions", src->index, dst->index);
mark_eh_edge_found_error = true;
}
else
@@ -1827,7 +1827,7 @@ verify_eh_edges (tree stmt)
{
if ((e->flags & EDGE_EH) && !e->aux)
{
- error ("Unnecessary EH edge %i->%i", bb->index, e->dest->index);
+ error ("unnecessary EH edge %i->%i", bb->index, e->dest->index);
mark_eh_edge_found_error = true;
return true;
}
diff -rupN GCC.orig/gcc/tree-ssa.c GCC/gcc/tree-ssa.c
--- GCC.orig/gcc/tree-ssa.c 2005-07-02 23:52:45.000000000 +0000
+++ GCC/gcc/tree-ssa.c 2005-07-03 01:01:33.000000000 +0000
@@ -108,38 +108,38 @@ verify_ssa_name (tree ssa_name, bool is_
{
if (TREE_CODE (ssa_name) != SSA_NAME)
{
- error ("Expected an SSA_NAME object");
+ error ("expected an SSA_NAME object");
return true;
}
if (TREE_TYPE (ssa_name) != TREE_TYPE (SSA_NAME_VAR (ssa_name)))
{
- error ("Type mismatch between an SSA_NAME and its symbol.");
+ error ("type mismatch between an SSA_NAME and its symbol");
return true;
}
if (SSA_NAME_IN_FREE_LIST (ssa_name))
{
- error ("Found an SSA_NAME that had been released into the free pool");
+ error ("found an SSA_NAME that had been released into the free pool");
return true;
}
if (is_virtual && is_gimple_reg (ssa_name))
{
- error ("Found a virtual definition for a GIMPLE register");
+ error ("found a virtual definition for a GIMPLE register");
return true;
}
if (!is_virtual && !is_gimple_reg (ssa_name))
{
- error ("Found a real definition for a non-register");
+ error ("found a real definition for a non-register");
return true;
}
if (is_virtual && var_ann (SSA_NAME_VAR (ssa_name))
&& get_subvars_for_var (SSA_NAME_VAR (ssa_name)) != NULL)
{
- error ("Found real variable when subvariables should have appeared");
+ error ("found real variable when subvariables should have appeared");
return true;
}
@@ -235,13 +235,13 @@ verify_use (basic_block bb, basic_block
; /* Default definitions have empty statements. Nothing to do. */
else if (!def_bb)
{
- error ("Missing definition");
+ error ("missing definition");
err = true;
}
else if (bb != def_bb
&& !dominated_by_p (CDI_DOMINATORS, bb, def_bb))
{
- error ("Definition in block %i does not dominate use in block %i",
+ error ("definition in block %i does not dominate use in block %i",
def_bb->index, bb->index);
err = true;
}
@@ -249,7 +249,7 @@ verify_use (basic_block bb, basic_block
&& names_defined_in_bb != NULL
&& !bitmap_bit_p (names_defined_in_bb, SSA_NAME_VERSION (ssa_name)))
{
- error ("Definition in block %i follows the use", def_bb->index);
+ error ("definition in block %i follows the use", def_bb->index);
err = true;
}
@@ -264,7 +264,7 @@ verify_use (basic_block bb, basic_block
element to make sure it's the same. */
if (use_p->prev == NULL)
{
- error ("No immediate_use list");
+ error ("no immediate_use list");
err = true;
}
else
@@ -276,7 +276,7 @@ verify_use (basic_block bb, basic_block
listvar = USE_FROM_PTR (use_p->prev);
if (listvar != ssa_name)
{
- error ("Wrong immediate use list");
+ error ("wrong immediate use list");
err = true;
}
}
@@ -309,7 +309,7 @@ verify_phi_args (tree phi, basic_block b
if (EDGE_COUNT (bb->preds) != phi_num_args)
{
- error ("Incoming edge count does not match number of PHI arguments\n");
+ error ("incoming edge count does not match number of PHI arguments");
err = true;
goto error;
}
@@ -324,7 +324,7 @@ verify_phi_args (tree phi, basic_block b
if (op == NULL_TREE)
{
- error ("PHI argument is missing for edge %d->%d\n",
+ error ("PHI argument is missing for edge %d->%d",
e->src->index,
e->dest->index);
err = true;
@@ -345,7 +345,7 @@ verify_phi_args (tree phi, basic_block b
if (e->dest != bb)
{
- error ("Wrong edge %d->%d for PHI argument\n",
+ error ("wrong edge %d->%d for PHI argument",
e->src->index, e->dest->index);
err = true;
}
@@ -394,7 +394,7 @@ verify_flow_insensitive_alias_info (void
if (!may_be_aliased (alias))
{
- error ("Non-addressable variable inside an alias set.");
+ error ("non-addressable variable inside an alias set");
debug_variable (alias);
goto err;
}
@@ -410,7 +410,7 @@ verify_flow_insensitive_alias_info (void
&& ann->is_alias_tag
&& !bitmap_bit_p (visited, DECL_UID (var)))
{
- error ("Addressable variable that is an alias tag but is not in any alias set.");
+ error ("addressable variable that is an alias tag but is not in any alias set");
goto err;
}
}
@@ -420,7 +420,7 @@ verify_flow_insensitive_alias_info (void
err:
debug_variable (var);
- internal_error ("verify_flow_insensitive_alias_info failed.");
+ internal_error ("verify_flow_insensitive_alias_info failed");
}
@@ -462,7 +462,7 @@ verify_flow_sensitive_alias_info (void)
ann = var_ann (var);
if (pi->is_dereferenced && !pi->name_mem_tag && !ann->type_mem_tag)
{
- error ("Dereferenced pointers should have a name or a type tag");
+ error ("dereferenced pointers should have a name or a type tag");
goto err;
}
@@ -470,7 +470,7 @@ verify_flow_sensitive_alias_info (void)
&& !pi->pt_malloc
&& (pi->pt_vars == NULL || bitmap_empty_p (pi->pt_vars)))
{
- error ("Pointers with a memory tag, should have points-to sets or point to malloc");
+ error ("pointers with a memory tag, should have points-to sets or point to malloc");
goto err;
}
@@ -478,7 +478,7 @@ verify_flow_sensitive_alias_info (void)
&& pi->name_mem_tag
&& !is_call_clobbered (pi->name_mem_tag))
{
- error ("Pointer escapes but its name tag is not call-clobbered.");
+ error ("pointer escapes but its name tag is not call-clobbered");
goto err;
}
}
@@ -487,7 +487,7 @@ verify_flow_sensitive_alias_info (void)
err:
debug_variable (ptr);
- internal_error ("verify_flow_sensitive_alias_info failed.");
+ internal_error ("verify_flow_sensitive_alias_info failed");
}
DEF_VEC_P (bitmap);
@@ -564,7 +564,7 @@ verify_name_tags (void)
if (!bitmap_intersect_compl_p (type_aliases, pi->pt_vars))
{
- error ("Alias set of a pointer's type tag should be a superset of the corresponding name tag");
+ error ("alias set of a pointer's type tag should be a superset of the corresponding name tag");
debug_variable (tmt);
debug_variable (pi->name_mem_tag);
goto err;
@@ -580,7 +580,7 @@ verify_name_tags (void)
{
if (bitmap_equal_p (first, second))
{
- error ("Two different pointers with identical points-to sets but different name tags");
+ error ("two different pointers with identical points-to sets but different name tags");
debug_variable (VEC_index (tree, name_tag_reps, j));
goto err;
}
@@ -683,7 +683,7 @@ verify_ssa (bool check_modified_stmt)
{
if (e->aux)
{
- error ("AUX pointer initialized for edge %d->%d\n", e->src->index,
+ error ("AUX pointer initialized for edge %d->%d", e->src->index,
e->dest->index);
goto err;
}
@@ -706,7 +706,7 @@ verify_ssa (bool check_modified_stmt)
if (check_modified_stmt && stmt_modified_p (stmt))
{
- error ("Stmt (%p) marked modified after optimization pass : ",
+ error ("stmt (%p) marked modified after optimization pass : ",
(void *)stmt);
print_generic_stmt (stderr, stmt, TDF_VOPS);
goto err;
@@ -724,7 +724,7 @@ verify_ssa (bool check_modified_stmt)
&& SSA_VAR_P (base_address)
&& ZERO_SSA_OPERANDS (stmt, SSA_OP_VMAYDEF|SSA_OP_VMUSTDEF))
{
- error ("Statement makes a memory store, but has no "
+ error ("statement makes a memory store, but has no "
"V_MAY_DEFS nor V_MUST_DEFS");
print_generic_stmt (stderr, stmt, TDF_VOPS);
goto err;
@@ -735,7 +735,7 @@ verify_ssa (bool check_modified_stmt)
if (stmt_ann (stmt)->makes_aliased_stores
&& ZERO_SSA_OPERANDS (stmt, SSA_OP_VMAYDEF))
{
- error ("Statement makes aliased stores, but has no V_MAY_DEFS");
+ error ("statement makes aliased stores, but has no V_MAY_DEFS");
print_generic_stmt (stderr, stmt, TDF_VOPS);
goto err;
}
@@ -774,7 +774,7 @@ verify_ssa (bool check_modified_stmt)
return;
err:
- internal_error ("verify_ssa failed.");
+ internal_error ("verify_ssa failed");
}
/* Return true if the uid in both int tree maps are equal. */
diff -rupN GCC.orig/gcc/xcoffout.c GCC/gcc/xcoffout.c
--- GCC.orig/gcc/xcoffout.c 2005-06-25 09:54:14.000000000 +0000
+++ GCC/gcc/xcoffout.c 2005-07-03 00:15:51.000000000 +0000
@@ -184,7 +184,7 @@ xcoff_assign_fundamental_type_number (tr
/* Print an error message for unrecognized stab codes. */
#define UNKNOWN_STAB(STR) \
- internal_error ("no sclass for %s stab (0x%x)\n", STR, stab)
+ internal_error ("no sclass for %s stab (0x%x)", STR, stab)
/* Conversion routine from BSD stabs to AIX storage classes. */