diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9a10cf4b901..163f988edd6 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,17 @@
+2001-04-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* jcf-io.c (read_zip_member): Cast to long in comparison with
+	signed value.
+
+	* jvspec.c (lang_specific_driver): Initialize variables.
+
+	* mangle.c (find_compression_record_match): Likewise.
+
+	* typeck.c (build_null_signature): Provide static prototype.  Mark
+	parameter with ATTRIBUTE_UNUSED.
+
+	* verify.c (verify_jvm_instructions): Initialize variable.
+
 2001-04-27  Per Bothner  <per@bothner.com>
 
 	* parse.y (java_expand_classes):  Don't change ctxp_for_generation
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 655e3812006..f2544380506 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -192,7 +192,7 @@ DEFUN(read_zip_member, (jcf, zipd, zipf),
 	      jcf->read_ptr = jcf->buffer;
 	      jcf->read_end = jcf->buffer_end;
 	      if (lseek (zipf->fd, zipd->filestart, 0) < 0
-		  || read (zipf->fd, jcf->buffer, zipd->size) != zipd->size)
+		  || read (zipf->fd, jcf->buffer, zipd->size) != (long) zipd->size)
 	        return -2;
 	    }
 	  else
@@ -213,7 +213,7 @@ DEFUN(read_zip_member, (jcf, zipd, zipf),
 	      d_stream.next_in = buffer;
 	      d_stream.avail_in = zipd->size;
 	      if (lseek (zipf->fd, zipd->filestart, 0) < 0
-		  || read (zipf->fd, buffer, zipd->size) != zipd->size)
+		  || read (zipf->fd, buffer, zipd->size) != (long) zipd->size)
 		return -2;
 	      /* Handle NO_HEADER using undocumented zlib feature.
                  This is a very common hack.  */
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index fd6ec5aab92..c02071ff308 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -126,9 +126,9 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
   int indirect_files_count = 0;
 
   /* Name of file containing list of files to compile. */
-  char *filelist_filename;
+  char *filelist_filename = 0;
 
-  FILE *filelist_file;
+  FILE *filelist_file = 0;
 
   /* The number of arguments being added to what's in argv, other than
      libraries.  */
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 166d96ba362..027eb5d5bab 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -314,7 +314,7 @@ find_compression_record_match (type, next_current)
      tree *next_current;
 {
   int i, match;
-  tree current, saved_current;
+  tree current, saved_current = NULL_TREE;
 
   /* Search from the beginning for something that matches TYPE, even
      partially. */
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index cc514d66d75..b61a290c7ed 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -40,6 +40,7 @@ static tree convert_ieee_real_to_integer PARAMS ((tree, tree));
 static tree parse_signature_type PARAMS ((const unsigned char **,
 					 const unsigned char *));
 static tree lookup_do PARAMS ((tree, tree, tree, tree, tree (*)(tree)));
+static tree build_null_signature PARAMS ((tree));
 
 tree * type_map;
 extern struct obstack permanent_obstack;
@@ -579,9 +580,9 @@ get_type_from_signature (tree signature)
   return type;
 }
 
-tree
+static tree
 build_null_signature (type)
-     tree type;
+     tree type ATTRIBUTE_UNUSED;
 {
   return NULL_TREE;
 }
diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 0a63477d715..941484350c1 100644
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -411,7 +411,7 @@ verify_jvm_instructions (jcf, byte_ops, length)
   int PC;
   int oldpc = 0; /* PC of start of instruction. */
   int prevpc = 0;  /* If >= 0, PC of previous instruction. */
-  const char *message;
+  const char *message = 0;
   char *pmessage;
   int i;
   int index;