--- gcc-2.95.3/gcc/ch/decl.c	Sun Jan 31 15:46:27 1999
+++ gcc-2.95.3-patch/gcc/ch/decl.c	Fri Jun  2 14:31:16 2006
@@ -4446,7 +4446,7 @@
 
 tree
 start_struct (code, name)
-     enum chill_tree_code code;
+     enum tree_code code;
      tree name ATTRIBUTE_UNUSED;
 {
   /* If there is already a tag defined at this binding level
--- gcc-2.95.3/gcc/ch/expr.c	Tue Jan 19 20:32:32 1999
+++ gcc-2.95.3-patch/gcc/ch/expr.c	Fri Jun  2 14:34:58 2006
@@ -3490,7 +3490,7 @@

 int
 compare_int_csts (op, val1, val2)
-     enum tree_code op;
+     enum chill_tree_code op;
      tree val1, val2;
 {
   int result;
--- gcc-2.95.3/gcc/f/com.h	1999-04-17 07:58:25.000000000 -0300
+++ gcc-2.95.3-patch/gcc/f/com.h	2006-06-02 19:12:20.000000000 -0300
@@ -310,7 +310,7 @@ void ffecom_finish_decl (tree decl, tree
 void ffecom_finish_progunit (void);
 tree ffecom_get_invented_identifier (const char *pattern, const char *text,
 				     int number);
-ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt ix);
+ffeinfoKindtype ffecom_gfrt_basictype (ffecomGfrt gfrt);
 ffeinfoKindtype ffecom_gfrt_kindtype (ffecomGfrt ix);
 void ffecom_init_0 (void);
 void ffecom_init_2 (void);
--- gcc-2.95.3/gcc/f/com.c	1999-06-28 23:27:42.000000000 -0300
+++ gcc-2.95.3-patch/gcc/f/com.c	2006-06-02 19:23:49.000000000 -0300
@@ -1596,7 +1596,7 @@ ffecom_widest_expr_type_ (ffebld list)
    aliasing of arguments, it isn't a concern.  */
 
 static bool
-ffecom_possible_partial_overlap_ (ffebld expr1, ffebld expr2)
+ffecom_possible_partial_overlap_ (ffebld expr1)
 {
   ffesymbol sym;
   ffestorag st;
@@ -11297,7 +11297,7 @@ ffecom_expand_let_stmt (ffebld dest, ffe
 	 create a temporary through which the assignment is to take place,
 	 since MODIFY_EXPR doesn't handle partial overlap properly.  */
       if (ffebld_basictype (dest) == FFEINFO_basictypeCOMPLEX
-	  && ffecom_possible_partial_overlap_ (dest, source))
+	  && ffecom_possible_partial_overlap_ (dest))
 	{
 	  assign_temp = ffecom_make_tempvar ("complex_let",
 					     ffecom_tree_type