diff options
| author | Joern Rennecke <joern.rennecke@st.com> | 2009-04-07 18:32:19 +0000 |
|---|---|---|
| committer | Joern Rennecke <joern.rennecke@st.com> | 2009-04-07 18:32:19 +0000 |
| commit | c8f3e958cb3a3ff38bcb98fc1f906b4590d44769 (patch) | |
| tree | d81c0729241f666fed195c5d3ab2cf9a74bc566b /gcc/genrecog.c | |
| parent | 21c32a2af97610f3ef27b15eb5475406aa7491cf (diff) | |
Merge gcc-in-cxx branch into multi-target-4_4-branch.
svn merge svn+ssh://amylaar@gcc.gnu.org/svn/gcc/trunk@144602 svn+ssh://amylaar@gcc.gnu.org/svn/gcc/branches/gcc-in-cxx@145084 .
and resolved conflicts:
C gcc/ChangeLog (entry moved to gcc/ChangeLog.cxx)
C gcc/cp/cp-tree.h
C gcc/df.h
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/multi-target-4_4-branch@145698 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/genrecog.c')
| -rw-r--r-- | gcc/genrecog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/genrecog.c b/gcc/genrecog.c index 01177c6de8f..62d421d39c6 100644 --- a/gcc/genrecog.c +++ b/gcc/genrecog.c @@ -378,7 +378,7 @@ process_define_predicate (rtx desc) for (i = 0; i < NUM_RTX_CODE; i++) if (codes[i] != N) - add_predicate_code (pred, i); + add_predicate_code (pred, (enum rtx_code) i); add_predicate (pred); } |