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/mcf.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/mcf.c')
| -rw-r--r-- | gcc/mcf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/mcf.c b/gcc/mcf.c index 9d3d7691910..899b5437968 100644 --- a/gcc/mcf.c +++ b/gcc/mcf.c @@ -388,8 +388,9 @@ add_edge (fixup_graph_type *fixup_graph, int src, int dest, gcov_type cost) MAX_CAPACITY to the edge_list in the fixup graph. */ static void -add_fixup_edge (fixup_graph_type *fixup_graph, int src, int dest, int type, - gcov_type weight, gcov_type cost, gcov_type max_capacity) +add_fixup_edge (fixup_graph_type *fixup_graph, int src, int dest, + edge_type type, gcov_type weight, gcov_type cost, + gcov_type max_capacity) { fixup_edge_p curr_edge = add_edge(fixup_graph, src, dest, cost); curr_edge->type = type; |