diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1998-10-21 08:00:11 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 1998-10-21 01:00:11 -0700 |
| commit | 866e9df806177f1ef2e67d261dd93795bb03e061 (patch) | |
| tree | 8b8c95af7b3a9f48f786854a5aadf0155698ce4b /gcc | |
| parent | cd916110da125725949ef751f24c97fbe0d82345 (diff) | |
| download | gcc-866e9df806177f1ef2e67d261dd93795bb03e061.zip gcc-866e9df806177f1ef2e67d261dd93795bb03e061.tar.gz gcc-866e9df806177f1ef2e67d261dd93795bb03e061.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/java/class.c | 2 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 2 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 4 | ||||
| -rw-r--r-- | gcc/java/parse.c | 2 | ||||
| -rw-r--r-- | gcc/java/parse.y | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index afc117a..9a0c08f 100644 --- 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 c637c76..cca0900 100644 --- 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 df0670c..aef477b 100644 --- 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 fee19c0..3df187f 100644 --- 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 e8ff19d..cd66dd0 100644 --- 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 d552871..fd0c4b5 100644 --- 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 |