2009-07-08 Shujing Zhao <pearly.zhao@oracle.com>

	* basic-block.h (dump_regset, debug_regset): Remove duplicate
	prototypes.
	* c-objc-common.h (c_initialize_diagnostics): Ditto.
	* ebitmap.h (dump_ebitmap): Ditto.
	* optabs.h (optab_libfunc): Ditto.
	* tree.h (tree_expr_nonzero_warnv_p): Ditto.
	* tree-flow.h (vect_can_force_dr_alignment_p,
	get_vectype_for_scalar_type): Ditto.	
	(vectorize_loops): Move prototype to ...
	* tree-vectorizer.h: ... here. Also, adjust comment. 
	(vect_set_verbosity_level): Remove duplicate prototype.
	* tree-ssa-loop.c: Include tree-vectorizer.h.
	* Makefile.in (tree-ssa-loop.o): Depend on tree-vectorizer.h.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149364 138bc75d-0d04-0410-961f-82ee72b054a4

10 files changed, 21 insertions, 16 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 78ee470c5bb..456879c53d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2009-07-08  Shujing Zhao  <pearly.zhao@oracle.com>
+
+	* basic-block.h (dump_regset, debug_regset): Remove duplicate
+	prototypes.
+	* c-objc-common.h (c_initialize_diagnostics): Ditto.
+	* ebitmap.h (dump_ebitmap): Ditto.
+	* optabs.h (optab_libfunc): Ditto.
+	* tree.h (tree_expr_nonzero_warnv_p): Ditto.
+	* tree-flow.h (vect_can_force_dr_alignment_p,
+	get_vectype_for_scalar_type): Ditto.	
+	(vectorize_loops): Move prototype to ...
+	* tree-vectorizer.h: ... here. Also, adjust comment. 
+	(vect_set_verbosity_level): Remove duplicate prototype.
+	* tree-ssa-loop.c: Include tree-vectorizer.h.
+	* Makefile.in (tree-ssa-loop.o): Depend on tree-vectorizer.h.
+
 2009-07-08  Nick Clifton  <nickc@redhat.com>
 
 	* config/i386/unix.h (ASM_COMMENT_START): Add a space after the
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6d82c6ba963..6a9c2fe4b91 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2308,7 +2308,7 @@ tree-eh.o : tree-eh.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
 tree-ssa-loop.o : tree-ssa-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(TREE_H) $(RTL_H) $(TM_P_H) hard-reg-set.h $(BASIC_BLOCK_H) output.h \
    $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TREE_PASS_H) $(TIMEVAR_H) \
-   $(CFGLOOP_H) $(FLAGS_H) $(TREE_INLINE_H) tree-scalar-evolution.h
+   $(CFGLOOP_H) $(FLAGS_H) $(TREE_INLINE_H) tree-scalar-evolution.h tree-vectorizer.h
 tree-ssa-loop-unswitch.o : tree-ssa-loop-unswitch.c $(TREE_FLOW_H) \
    $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) \
    $(PARAMS_H) output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) \
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 72bdf5c6504..12256a23f07 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -857,8 +857,6 @@ extern bool br_prob_note_reliable_p (const_rtx);
 extern bool predictable_edge_p (edge);
 
 /* In cfg.c  */
-extern void dump_regset (regset, FILE *);
-extern void debug_regset (regset);
 extern void init_flow (struct function *);
 extern void debug_bb (basic_block);
 extern basic_block debug_bb_n (int);
diff --git a/gcc/c-objc-common.h b/gcc/c-objc-common.h
index 6ef98febfb5..aaff1c9e390 100644
--- a/gcc/c-objc-common.h
+++ b/gcc/c-objc-common.h
@@ -21,9 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_C_OBJC_COMMON
 #define GCC_C_OBJC_COMMON
 
-/* In c-objc-common.c.  */
-extern void c_initialize_diagnostics (diagnostic_context *);
-
 /* Lang hooks that are shared between C and ObjC are defined here.  Hooks
    specific to C or ObjC go in c-lang.c and objc/objc-lang.c, respectively.  */
 
diff --git a/gcc/ebitmap.h b/gcc/ebitmap.h
index 1539c9ad033..4f9fd44ceb3 100644
--- a/gcc/ebitmap.h
+++ b/gcc/ebitmap.h
@@ -64,7 +64,6 @@ extern bool ebitmap_equal_p (ebitmap, ebitmap);
 extern void ebitmap_clear (ebitmap);
 extern int ebitmap_last_set_bit (ebitmap);
 extern void debug_ebitmap (ebitmap);
-extern void dump_ebitmap (FILE *, ebitmap);
 extern unsigned long ebitmap_popcount(ebitmap, unsigned long);
 
 /* The iterator for ebitmap.  */
diff --git a/gcc/optabs.h b/gcc/optabs.h
index 82f8084883a..2cb8f676f3e 100644
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -782,7 +782,6 @@ extern rtx expand_vec_shift_expr (tree, rtx);
 	(&(optab)->handlers[(int) (mode)][(int) (mode2)])
 
 extern rtx optab_libfunc (optab optab, enum machine_mode mode);
-extern rtx optab_libfunc (optab optab, enum machine_mode mode);
 extern rtx convert_optab_libfunc (convert_optab optab, enum machine_mode mode1,
 			          enum machine_mode mode2);
 #endif /* GCC_OPTABS_H */
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index 8d9b393e56e..c7733104dd0 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -729,11 +729,6 @@ struct tree_niter_desc
   enum tree_code cmp;
 };
 
-/* In tree-vectorizer.c */
-unsigned vectorize_loops (void);
-extern bool vect_can_force_dr_alignment_p (const_tree, unsigned int);
-extern tree get_vectype_for_scalar_type (tree);
-
 /* In tree-ssa-phiopt.c */
 bool empty_block_p (basic_block);
 basic_block *blocks_in_phiopt_order (void);
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index 4dcdc02d2d6..0aab6d3a2d3 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "tree-inline.h"
 #include "tree-scalar-evolution.h"
+#include "tree-vectorizer.h"
 
 /* The loop superpass.  */
 
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 6e8f879caf3..05f5e4783f7 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -861,8 +861,9 @@ typedef gimple (* vect_recog_func_ptr) (gimple, tree *, tree *);
 #define NUM_PATTERNS 4
 void vect_pattern_recog (loop_vec_info);
 
-/*  Vectorization debug information - in tree-vectorizer.c.  */
+/* In tree-vectorizer.c.  */
+unsigned vectorize_loops (void);
+/* Vectorization debug information */
 extern bool vect_print_dump_info (enum verbosity_levels);
-extern void vect_set_verbosity_level (const char *);
 
 #endif  /* GCC_TREE_VECTORIZER_H  */
diff --git a/gcc/tree.h b/gcc/tree.h
index cc00c6d31fe..2f2a65aedee 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4749,7 +4749,6 @@ extern bool tree_unary_nonzero_warnv_p (enum tree_code, tree, tree, bool *);
 extern bool tree_binary_nonzero_warnv_p (enum tree_code, tree, tree, tree op1,
                                          bool *);
 extern bool tree_single_nonzero_warnv_p (tree, bool *);
-extern bool tree_expr_nonzero_warnv_p (tree, bool *);
 extern bool tree_unary_nonnegative_warnv_p (enum tree_code, tree, tree, bool *);
 extern bool tree_binary_nonnegative_warnv_p (enum tree_code, tree, tree, tree,
                                              bool *);