prims.cc (_Jv_CreateJavaVM): Install SEGV and FPE handlers...

	* prims.cc (_Jv_CreateJavaVM): Install SEGV and FPE handlers,
	if desired, before the default class loader is initialised.
	Call INIT_SEGV only if HANDLE_SEGV is defined.

From-SVN: r83348

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d0ec4b553d25051fe0f34e5bb531c73edc7b9ce..20b07262023ed302fbe85ecbe307ed4cf6f1ab7b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-18  Ranjit Mathew  <rmathew@hotmail.com>
+
+       * prims.cc (_Jv_CreateJavaVM): Install SEGV and FPE handlers,
+       if desired, before the default class loader is initialised.
+       Call INIT_SEGV only if HANDLE_SEGV is defined.
+
 2004-06-18  Ranjit Mathew  <rmathew@hotmail.com>
 
        * gnu/gcj/runtime/VMClassLoader.java (init): Add extensions

diff --git a/libjava/prims.cc b/libjava/prims.cc
index 29f2b2090e8168cf064d34c1d87e7686d02022ed..cbcbc9fbf168aaf965093c272e3efde97476b4c3 100644 (file)
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -954,6 +954,14 @@ _Jv_CreateJavaVM (void* /*vm_args*/)
   _Jv_InitGC ();
   _Jv_InitializeSyncMutex ();
 
+#ifdef HANDLE_SEGV
+  INIT_SEGV;
+#endif
+
+#ifdef HANDLE_FPE
+  INIT_FPE;
+#endif
+
   /* Initialize Utf8 constants declared in jvm.h. */
   void_signature = _Jv_makeUtf8Const ("()V", 3);
   clinit_name = _Jv_makeUtf8Const ("<clinit>", 8);
@@ -980,15 +988,11 @@ _Jv_CreateJavaVM (void* /*vm_args*/)
   // initialization of ClassLoader before we start the initialization
   // of VMClassLoader.
   _Jv_InitClass (&java::lang::ClassLoader::class$);
+
   // Once the bootstrap loader is in place, change it into a kind of
   // system loader, by having it read the class path.
   gnu::gcj::runtime::VMClassLoader::initialize();
 
-  INIT_SEGV;
-#ifdef HANDLE_FPE
-  INIT_FPE;
-#endif
-  
   no_memory = new java::lang::OutOfMemoryError;
 
   java::lang::VMThrowable::trace_enabled = 1;