From ad81223cbfb252ef282ad64ee5e5fde0f3ff16ea Mon Sep 17 00:00:00 2001
From: Alexandre Petit-Bianco <apbianco@cygnus.com>
Date: Thu, 27 Apr 2000 23:25:18 +0000
Subject: [PATCH] decl.c (complete_start_java_method): Don't call _Jv_InitClass
 from <clinit>

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>

From-SVN: r33493
---
 gcc/java/ChangeLog | 5 +++++
 gcc/java/decl.c    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8693331446e..daa3776d903 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 915d2c9359e..659d4196838 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);