svn commit: r222207 - head/contrib/gcc
Ben Laurie
benl at FreeBSD.org
Sun May 22 22:17:07 UTC 2011
Author: benl
Date: Sun May 22 22:17:06 2011
New Revision: 222207
URL: http://svn.freebsd.org/changeset/base/222207
Log:
Fix clang warnings.
Approved by: philip (mentor)
Modified:
head/contrib/gcc/combine.c
head/contrib/gcc/emit-rtl.c
head/contrib/gcc/function.c
head/contrib/gcc/omp-low.c
head/contrib/gcc/tree-cfg.c
head/contrib/gcc/tree-vect-patterns.c
Modified: head/contrib/gcc/combine.c
==============================================================================
--- head/contrib/gcc/combine.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/combine.c Sun May 22 22:17:06 2011 (r222207)
@@ -12442,7 +12442,7 @@ distribute_notes (rtx notes, rtx from_in
REG_N_DEATHS (REGNO (XEXP (note, 0)))++;
REG_NOTES (place2) = gen_rtx_fmt_ee (GET_CODE (note),
- REG_NOTE_KIND (note),
+ GET_MODE (note),
XEXP (note, 0),
REG_NOTES (place2));
}
Modified: head/contrib/gcc/emit-rtl.c
==============================================================================
--- head/contrib/gcc/emit-rtl.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/emit-rtl.c Sun May 22 22:17:06 2011 (r222207)
@@ -3210,7 +3210,7 @@ try_split (rtx pat, rtx trial, int last)
{
if (CALL_P (insn))
REG_NOTES (insn)
- = gen_rtx_EXPR_LIST (REG_NOTE_KIND (note),
+ = gen_rtx_EXPR_LIST (GET_MODE (note),
XEXP (note, 0),
REG_NOTES (insn));
insn = PREV_INSN (insn);
@@ -3223,7 +3223,7 @@ try_split (rtx pat, rtx trial, int last)
{
if (JUMP_P (insn))
REG_NOTES (insn)
- = gen_rtx_EXPR_LIST (REG_NOTE_KIND (note),
+ = gen_rtx_EXPR_LIST (GET_MODE (note),
XEXP (note, 0),
REG_NOTES (insn));
insn = PREV_INSN (insn);
@@ -4589,7 +4589,8 @@ set_unique_reg_note (rtx insn, enum reg_
return note;
}
- REG_NOTES (insn) = gen_rtx_EXPR_LIST (kind, datum, REG_NOTES (insn));
+ REG_NOTES (insn) = gen_rtx_EXPR_LIST ((enum machine_mode) kind, datum,
+ REG_NOTES (insn));
return REG_NOTES (insn);
}
@@ -5344,12 +5345,12 @@ emit_copy_of_insn_after (rtx insn, rtx a
{
if (GET_CODE (link) == EXPR_LIST)
REG_NOTES (new)
- = copy_insn_1 (gen_rtx_EXPR_LIST (REG_NOTE_KIND (link),
+ = copy_insn_1 (gen_rtx_EXPR_LIST (GET_MODE (link),
XEXP (link, 0),
REG_NOTES (new)));
else
REG_NOTES (new)
- = copy_insn_1 (gen_rtx_INSN_LIST (REG_NOTE_KIND (link),
+ = copy_insn_1 (gen_rtx_INSN_LIST (GET_MODE (link),
XEXP (link, 0),
REG_NOTES (new)));
}
Modified: head/contrib/gcc/function.c
==============================================================================
--- head/contrib/gcc/function.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/function.c Sun May 22 22:17:06 2011 (r222207)
@@ -4008,22 +4008,19 @@ stack_protect_epilogue (void)
/* Allow the target to compare Y with X without leaking either into
a register. */
- switch (HAVE_stack_protect_test != 0)
+ if (HAVE_stack_protect_test != 0)
{
- case 1:
tmp = gen_stack_protect_test (x, y, label);
if (tmp)
{
emit_insn (tmp);
- break;
+ goto done;
}
- /* FALLTHRU */
-
- default:
- emit_cmp_and_jump_insns (x, y, EQ, NULL_RTX, ptr_mode, 1, label);
- break;
}
+ emit_cmp_and_jump_insns (x, y, EQ, NULL_RTX, ptr_mode, 1, label);
+ done:
+
/* The noreturn predictor has been moved to the tree level. The rtl-level
predictors estimate this branch about 20%, which isn't enough to get
things moved out of line. Since this is the only extant case of adding
Modified: head/contrib/gcc/omp-low.c
==============================================================================
--- head/contrib/gcc/omp-low.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/omp-low.c Sun May 22 22:17:06 2011 (r222207)
@@ -118,7 +118,7 @@ static tree maybe_lookup_decl_in_outer_c
/* Find an OpenMP clause of type KIND within CLAUSES. */
static tree
-find_omp_clause (tree clauses, enum tree_code kind)
+find_omp_clause (tree clauses, enum omp_clause_code kind)
{
for (; clauses ; clauses = OMP_CLAUSE_CHAIN (clauses))
if (OMP_CLAUSE_CODE (clauses) == kind)
Modified: head/contrib/gcc/tree-cfg.c
==============================================================================
--- head/contrib/gcc/tree-cfg.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/tree-cfg.c Sun May 22 22:17:06 2011 (r222207)
@@ -2854,7 +2854,7 @@ bsi_insert_before (block_stmt_iterator *
{
set_bb_for_stmt (t, i->bb);
update_modified_stmts (t);
- tsi_link_before (&i->tsi, t, m);
+ tsi_link_before (&i->tsi, t, (enum tsi_iterator_update) m);
}
@@ -2867,7 +2867,7 @@ bsi_insert_after (block_stmt_iterator *i
{
set_bb_for_stmt (t, i->bb);
update_modified_stmts (t);
- tsi_link_after (&i->tsi, t, m);
+ tsi_link_after (&i->tsi, t, (enum tsi_iterator_update) m);
}
Modified: head/contrib/gcc/tree-vect-patterns.c
==============================================================================
--- head/contrib/gcc/tree-vect-patterns.c Sun May 22 22:16:19 2011 (r222206)
+++ head/contrib/gcc/tree-vect-patterns.c Sun May 22 22:17:06 2011 (r222207)
@@ -487,7 +487,7 @@ vect_pattern_recog_1 (
}
else
{
- enum tree_code vec_mode;
+ enum machine_mode vec_mode;
enum insn_code icode;
optab optab;
More information about the svn-src-all
mailing list