Fix merge typos.

From-SVN: r53288

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7a55da7..0f21cf4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1227,7 +1227,7 @@ c-format.o : c-format.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) langhooks.h \
 
 c-semantics.o : c-semantics.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) \
        c-lex.h flags.h toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \
-       $(EXPR_H) predict.h
+       $(EXPR_H) $(PREDICT_H)
 
 # Language-independent files.
 
@@ -1389,7 +1389,7 @@ function.o : function.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \
 stmt.o : stmt.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h function.h  \
    insn-config.h hard-reg-set.h $(EXPR_H) libfuncs.h except.h \
    $(LOOP_H) $(RECOG_H) toplev.h output.h varray.h $(GGC_H) $(TM_P_H) \
-   langhooks.h predict.h
+   langhooks.h $(PREDICT_H)
 except.o : except.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \
    except.h function.h $(EXPR_H) libfuncs.h integrate.h langhooks.h \
    insn-config.h hard-reg-set.h $(BASIC_BLOCK_H) output.h \

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 1bb3d9b..826569a 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -74,7 +74,6 @@ static int flow_find_cross_jump               PARAMS ((int, basic_block, basic_block,
                                                 rtx *, rtx *));
 static bool insns_match_p              PARAMS ((int, rtx, rtx));
 
-bool delete_unreachable_blocks         PARAMS ((void));
 static bool label_is_jump_target_p     PARAMS ((rtx, rtx));
 static bool tail_recursion_label_p     PARAMS ((rtx));
 static void merge_blocks_move_predecessor_nojumps PARAMS ((basic_block,