aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/decl.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8693331..daa3776 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 26 14:29:33 2000 Alexandre Petit-Bianco <apbianco@cygnus.com>
+
+ * decl.c (complete_start_java_method): Don't call _Jv_InitClass
+ from <clinit>
+
2000-04-26 Tom Tromey <tromey@cygnus.com>
* zextract.c (find_zip_file_start): New function.
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 915d2c9..659d419 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1692,6 +1692,7 @@ complete_start_java_method (fndecl)
if (METHOD_STATIC (fndecl) && ! METHOD_PRIVATE (fndecl)
&& ! flag_emit_class_files
+ && ! DECL_CLINIT_P (fndecl)
&& ! CLASS_INTERFACE (TYPE_NAME (current_class)))
{
tree clas = DECL_CONTEXT (fndecl);