[multiple changes]

Fri May 14 12:31:08 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
	* xref.c (xref_set_current_fp): New function, defined.
	* xref.h (xref_set_current_fp): New function, prototyped.
Fri May 14 11:57:54 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
	* check-init.c (check_init): Take into account that
 	LABELED_BLOCK_STMT can be empty.

From-SVN: r26935

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index cf33bd553398a82b08ea9c328cf04c2236aca4b7..61ccfe6b3f980d96f758f4016efb1c5ead914021 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,10 +1,21 @@
+Fri May 14 12:31:08 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * xref.c (xref_set_current_fp): New function, defined.
+       * xref.h (xref_set_current_fp): New function, prototyped.
+
+Fri May 14 11:57:54 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * check-init.c (check_init): Take into account that
+       LABELED_BLOCK_STMT can be empty.
+
 Thu May 13 18:30:48 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * parse.y (java_check_regular_methods): Warning check on not
        overriding methods with default access in other packages does not
        apply to `<clinit>'.
        (java_complete_lhs): If block body is an empty_stmt_node, replace
-       it by NULL_TREE. This avoid gcc generating an irrelevant warning.
+       it by NULL_TREE. This prevents gcc from generating an irrelevant
+       warning.
 
 Thu May 13 13:23:38 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 

diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c
index 071faf74924c157f9f217e2ff0aa6cbecb32aaac..67e2524cf9b43712961509685956b9dd8841489f 100644 (file)
--- a/gcc/java/check-init.c
+++ b/gcc/java/check-init.c
@@ -475,7 +475,8 @@ check_init (exp, before)
        struct alternatives alt;
        BEGIN_ALTERNATIVES (before, alt);
        alt.block = exp;
-       check_init (LABELED_BLOCK_BODY (exp), before);
+       if (LABELED_BLOCK_BODY (exp))
+         check_init (LABELED_BLOCK_BODY (exp), before);
        done_alternative (before, &alt);
        END_ALTERNATIVES (before, alt);
        return;

diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index df3a199af62a818f941c3261499a56088f9a298b..cd6fb3bd569d47f894b15ed8e59bfb8e073b1c1e 100644 (file)
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -173,16 +173,6 @@ lang_decode_option (argc, argv)
     }
 #undef ARG
 
-#define XARG "-fxref="
-  if (strncmp (p, XARG, sizeof (XARG) - 1) == 0)
-    {
-      if (!(flag_emit_xref = xref_flag_value (p + sizeof (XARG) - 1)))
-       error ("Unkown xref format `%s'", p + sizeof (XARG) - 1);
-      else
-       return 1;
-    }
-#undef XARG
-
   if (p[0] == '-' && p[1] == 'f')
     {
       /* Some kind of -f option.

diff --git a/gcc/java/xref.c b/gcc/java/xref.c
index 0e269bf6b663fe66cbbe74200fb22b26ec9e30b9..8835e8dfcace169608b1b54dda34d17315ea8543 100644 (file)
--- a/gcc/java/xref.c
+++ b/gcc/java/xref.c
@@ -66,6 +66,13 @@ xref_get_data (flag)
   return xref_table [flag-1].data;
 }
 
+void
+xref_set_current_fp (fp)
+     FILE *fp;
+{
+  xref_table [flag_emit_xref-1].fp = fp;
+}
+
 /* Branch to the right xref "back-end".  */
 
 void

diff --git a/gcc/java/xref.h b/gcc/java/xref.h
index 042122b4ec7ed03cfea79112f6636958a7d1685d..7a98834c2db11b4b79254658d2e3b3ba695448d1 100644 (file)
--- a/gcc/java/xref.h
+++ b/gcc/java/xref.h
@@ -28,6 +28,7 @@ int xref_flag_value PROTO ((char *));
 void expand_xref PROTO ((tree));
 void xref_set_data PROTO ((int, void *));
 void *xref_get_data PROTO ((int));
+void xref_set_current_fp PROTO ((FILE *));
 
 /* flag_emit_xref range of possible values. */