gcc/ChangeLog
2008-08-29  you  <>

	* tree-ssa-sccvn.c (sort_vuses_heap): Remove.
	* tree-flow.h (make_value_handle, set_value_handle, vn_lookup_or_add,
	vn_lookup_or_add_with_stmt, vn_lookup_or_add_with_vuses, vn_add,
	vn_add_with_vuses, vn_lookup_with_stmt, vn_lookup,
	vn_lookup_with_vuses): Remove orphaned exports.
	(expressions_equal_p, sort_vuses): Move to...
	* tree-ssa-sccvn.h: ... here.
	* matrix-reorg.c: Include tree-ssa-sccvn.h.

Index: gcc-4.4/gcc/tree-ssa-sccvn.c
===================================================================
--- gcc-4.4/gcc/tree-ssa-sccvn.c	(revision 139600)
+++ gcc-4.4/gcc/tree-ssa-sccvn.c	(working copy)
@@ -3016,15 +3017,3 @@ sort_vuses (VEC (tree,gc) *vuses)
 	   operand_build_cmp);
 }
 
-/* Sort the VUSE array so that we can do equality comparisons
-   quicker on two vuse vecs.  */
-
-void
-sort_vuses_heap (VEC (tree,heap) *vuses)
-{
-  if (VEC_length (tree, vuses) > 1)
-    qsort (VEC_address (tree, vuses),
-	   VEC_length (tree, vuses),
-	   sizeof (tree),
-	   operand_build_cmp);
-}
Index: gcc-4.4/gcc/tree-ssa-sccvn.h
===================================================================
--- gcc-4.4/gcc/tree-ssa-sccvn.h	(revision 139600)
+++ gcc-4.4/gcc/tree-ssa-sccvn.h	(working copy)
@@ -21,6 +21,11 @@
 #ifndef TREE_SSA_SCCVN_H
 #define TREE_SSA_SCCVN_H
 
+/* In tree-ssa-sccvn.c  */
+bool expressions_equal_p (tree, tree);
+void sort_vuses (VEC (tree, gc) *);
+
+
 /* TOP of the VN lattice.  */
 extern tree VN_TOP;
 
Index: gcc-4.4/gcc/tree-flow.h
===================================================================
--- gcc-4.4/gcc/tree-flow.h	(revision 139765)
+++ gcc-4.4/gcc/tree-flow.h	(working copy)
@@ -1088,22 +1088,6 @@ void add_to_value (unsigned int, struct 
 void debug_value_expressions (unsigned int);
 void print_value_expressions (FILE *, unsigned int);
 
-
-/* In tree-vn.c  */
-tree make_value_handle (tree);
-void set_value_handle (tree, tree);
-bool expressions_equal_p (tree, tree);
-void sort_vuses (VEC (tree, gc) *);
-void sort_vuses_heap (VEC (tree, heap) *);
-tree vn_lookup_or_add (tree);
-tree vn_lookup_or_add_with_stmt (tree, gimple);
-tree vn_lookup_or_add_with_vuses (tree, VEC (tree, gc) *);
-void vn_add (tree, tree);
-void vn_add_with_vuses (tree, tree, VEC (tree, gc) *);
-tree vn_lookup_with_stmt (tree, gimple);
-tree vn_lookup (tree);
-tree vn_lookup_with_vuses (tree, VEC (tree, gc) *);
-
 /* In tree-ssa-sink.c  */
 bool is_hidden_global_store (gimple);
 
Index: gcc-4.4/gcc/matrix-reorg.c
===================================================================
--- gcc-4.4/gcc/matrix-reorg.c	(revision 139600)
+++ gcc-4.4/gcc/matrix-reorg.c	(working copy)
@@ -142,6 +142,7 @@ along with GCC; see the file COPYING3.  
 #include "tree-data-ref.h"
 #include "tree-chrec.h"
 #include "tree-scalar-evolution.h"
+#include "tree-ssa-sccvn.h"
 
 /* We need to collect a lot of data from the original malloc,
    particularly as the gimplifier has converted: