class.c (emit_register_classes): Renamed from emit_register_class.

Wed Oct 21 07:54:11 1998  Alexandre Petit-Bianco  <apbianco@cygnus.com>
	* class.c (emit_register_classes): Renamed from
 	emit_register_class.
	* java-tree.h (emit_register_classes): Prototype renamed from
 	emit_register_class.
	* jcf-parse.c (yyparse): Call emit_register_classes once before
 	returning.
	* parse.y (java_expand_classes): No longer register classes.
Prevents the generation of multiple static constructor for a
compilation unit.

From-SVN: r23208

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index afc117a2fb705763fc6eac2c5fde8207b8c0a20e..9a0c08f10f8089e8594238408856a1919a07c16b 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,13 @@
+Wed Oct 21 07:54:11 1998  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * class.c (emit_register_classes): Renamed from
+       emit_register_class.
+       * java-tree.h (emit_register_classes): Prototype renamed from
+       emit_register_class.
+       * jcf-parse.c (yyparse): Call emit_register_classes once before
+       returning.
+       * parse.y (java_expand_classes): No longer register classes.
+
 Tue Oct 20 09:15:38 1998  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * class.c (is_compiled_class): New local variable

diff --git a/gcc/java/class.c b/gcc/java/class.c
index c637c762c9889de331ddaea3cc45f718642d6ceb..cca09006fd3f40f35b18f0bf5b3b611d286c5966 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1557,7 +1557,7 @@ register_class ()
    which calls registerClass for all the compiled classes. */
 
 void
-emit_register_class ()
+emit_register_classes ()
 {
   tree decl = getdecls ();
 

diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index df0670cfcad1d9d5a05accbed261f84e6695821a..aef477be4a2c79dbd9c3cd17503d9f7b43116ee8 100644 (file)
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -524,7 +524,7 @@ extern void init_outgoing_cpool PROTO (());
 extern void make_class_data PROTO ((tree));
 extern void register_class PROTO (());
 extern int alloc_name_constant PROTO ((int, tree));
-extern void emit_register_class PROTO (());
+extern void emit_register_classes PROTO (());
 extern void lang_init_source PROTO ((int));
 
 /* Access flags etc for a method (a FUNCTION_DECL): */

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index fee19c06a2e8eeb991ccdf04a8ad2ae3b8754d29..3df187fa347876ad0f56a1a53ceff74c22bb7dcd 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -777,12 +777,10 @@ yyparse ()
        {
        case JCF_ZIP:
          parse_zip_file_entries ();
-         emit_register_class ();
          break;
        case JCF_CLASS:
          jcf_parse (current_jcf);
          parse_class_file ();
-         emit_register_class ();
          break;
        case JCF_SOURCE:
          parse_source_file (0);        /* Parse and generate */
@@ -790,6 +788,8 @@ yyparse ()
        }
     }
   java_expand_classes ();
+  if (! flag_emit_class_files)
+    emit_register_classes ();
   return 0;
 }
 

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index e8ff19d301f25133cbebe7c8b45c3354f08a8022..cd66dd01b2a62477cbfa1a008159b0c6d516a944 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -7545,8 +7545,6 @@ java_expand_classes ()
       java_check_final ();            /* Check unitialized final  */
       java_parse_abort_on_error ();
     }
-  if (! flag_emit_class_files)
-    emit_register_class ();
 }
 
 /* Wrap non WFL PRIMARY around a WFL and set EXPR_WFL_QUALIFICATION to

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index d552871c7e4b832fe66326da5b5de2c978b9af77..fd0c4b5cc9283a1f3340102f62eb11aac1b16f64 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -4939,8 +4939,6 @@ java_expand_classes ()
       java_check_final ();            /* Check unitialized final  */
       java_parse_abort_on_error ();
     }
-  if (! flag_emit_class_files)
-    emit_register_class ();
 }
 
 /* Wrap non WFL PRIMARY around a WFL and set EXPR_WFL_QUALIFICATION to