diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab788fa5ab0..3b464a1adc6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2000-04-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* sparc.c (output_restore_regs): Prototype.
+	(sparc_emit_float_lib_cmp): Constification.
+
+	* emit-rtl.c (const_int_htab_hash, const_int_htab_eq): Likewise.
+
+	* reload1.c (reload_cse_delete_noop_set, reload_cse_simplify):
+	Prototype.
+
+	* simplify-rtx.c (entry_and_rtx_equal_p): Constification.
+	(get_value_hash, hash_rtx): Likewise.
+
+	* ssa.c (compute_conservative_reg_partition): Prototype.
+
+	* tree.c (mark_hash_entry): Prototype.
+
 2000-04-03  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* bb-reorder.c (verify_insn_chain): #ifdef out unless ENABLE_CHECKING.
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 7c27bbc48d1..2ee24c17e57 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -155,6 +155,7 @@ static void ultra_build_types_avail PARAMS ((rtx *, int));
 static void ultra_flush_pipeline PARAMS ((void));
 static void ultra_rescan_pipeline_state PARAMS ((rtx *, int));
 static int set_extends PARAMS ((rtx, rtx));
+static void output_restore_regs PARAMS ((FILE *, int));
 
 /* Option handling.  */
 
@@ -5052,7 +5053,7 @@ sparc_emit_float_lib_cmp (x, y, comparison)
      rtx x, y;
      enum rtx_code comparison;
 {
-  char *qpfunc;
+  const char *qpfunc;
   rtx slot0, slot1, result, tem, tem2;
   enum machine_mode mode;
 
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index b67e9f131a7..feead7697dc 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -191,7 +191,7 @@ static hashval_t
 const_int_htab_hash (x)
      const void *x;
 {
-  return (hashval_t) INTVAL ((rtx) x);
+  return (hashval_t) INTVAL ((const struct rtx_def *) x);
 }
 
 /* Returns non-zero if the value represented by X (which is really a
@@ -203,7 +203,7 @@ const_int_htab_eq (x, y)
      const void *x;
      const void *y;
 {
-  return (INTVAL ((rtx) x) == *((HOST_WIDE_INT *) y));
+  return (INTVAL ((const struct rtx_def *) x) == *((const HOST_WIDE_INT *) y));
 }
 
 /* Mark the hash-table element X (which is really a pointer to an
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 996336c2620..3520883f316 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -451,6 +451,8 @@ static rtx gen_mode_int			PARAMS ((enum machine_mode,
 						 HOST_WIDE_INT));
 static void failed_reload		PARAMS ((rtx, int));
 static int set_reload_reg		PARAMS ((int, int));
+static void reload_cse_delete_noop_set	PARAMS ((rtx, rtx));
+static void reload_cse_simplify		PARAMS ((rtx));
 extern void dump_needs			PARAMS ((struct insn_chain *, FILE *));
 
 /* Initialize the reload pass once per compilation.  */
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 22549b4fe69..9e2674304ba 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -2141,7 +2141,7 @@ entry_and_rtx_equal_p (entry, x_arg)
      const void *entry, *x_arg;
 {
   struct elt_loc_list *l;
-  cselib_val *v = (cselib_val *)entry;
+  const cselib_val *v = (const cselib_val *)entry;
   rtx x = (rtx)x_arg;
 
   /* We don't guarantee that distinct rtx's have different hash values,
@@ -2159,7 +2159,7 @@ static unsigned int
 get_value_hash (entry)
      const void *entry;
 {
-  cselib_val *v = (cselib_val *) entry;
+  const cselib_val *v = (const cselib_val *) entry;
   return v->value;
 }
 
@@ -2543,7 +2543,7 @@ hash_rtx (x, mode, create)
 	  }
       else if (fmt[i] == 's')
 	{
-	  unsigned char *p = (unsigned char *) XSTR (x, i);
+	  const unsigned char *p = (const unsigned char *) XSTR (x, i);
 	  if (p)
 	    while (*p)
 	      hash += *p++;
diff --git a/gcc/ssa.c b/gcc/ssa.c
index 26ed50ea8fb..54c36ddc7e3 100644
--- a/gcc/ssa.c
+++ b/gcc/ssa.c
@@ -121,7 +121,7 @@ static int make_regs_equivalent_over_bad_edges
 static int make_equivalent_phi_alternatives_equivalent 
   PARAMS ((int bb, partition reg_partition));
 static partition compute_conservative_reg_partition 
-  PARAMS (());
+  PARAMS ((void));
 static int rename_equivalent_regs_in_insn 
   PARAMS ((rtx *ptr, void *data));
 static void rename_equivalent_regs 
diff --git a/gcc/tree.c b/gcc/tree.c
index f018e9d86cf..53ca207107e 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -281,6 +281,7 @@ static void mark_type_hash PARAMS ((void *));
 static int type_hash_eq PARAMS ((const void*, const void*));
 static unsigned int type_hash_hash PARAMS ((const void*));
 static void print_type_hash_statistics PARAMS((void));
+static int mark_hash_entry PARAMS((void **, void *));
 
 /* If non-null, these are language-specific helper functions for
    unsave_expr_now.  If present, LANG_UNSAVE is called before its