From 150315eee8c9f1df3129b2be82d679fcca4335cd Mon Sep 17 00:00:00 2001 From: aph Date: Wed, 10 May 2006 17:17:20 +0000 Subject: 2006-05-09 Andrew Haley * prims.cc (_Jv_soleIndirectCompiledEngine): New. * include/execution.h (Jv_CompiledEngine::do_allocate_static_fields): Remove body. (_Jv_CompiledEngine::allocate_field_initializers): New. (_Jv_CompiledEngine::_Jv_CompiledEngine): Initialize allocate_field_initializers. (class _Jv_IndirectCompiledClass): New. (struct _Jv_IndirectCompiledEngine): New. * java/lang/Class.h: (IndirectCompiledEngine): New. * java/lang/natClassLoader.cc (_Jv_NewClassFromInitializer): Set engine to _Jv_soleIndirectCompiledEngine * link.cc (ensure_fields_laid_out): Call engine->allocate_field_initializers(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113674 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/gnu/gcj/runtime') diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index fcff8f200b4..19d136c027e 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -44,7 +44,8 @@ _Jv_sharedlib_register_hook (jclass cls) { cls->protectionDomain = curHelper->domain; cls->loader = curLoader; - cls->engine = &_Jv_soleCompiledEngine; + if (! cls->engine) + cls->engine = &_Jv_soleCompiledEngine; curHelper->registerClass(cls->getName(), cls); } @@ -95,6 +96,7 @@ gnu::gcj::runtime::SharedLibHelper::init(void) { const char *msg = dlerror(); throw new java::lang::UnknownError(JvNewStringLatin1(msg)); + fprintf (stderr, "failed loading %s: %s\n", lname, msg); } handler = (gnu::gcj::RawData*) h; #else -- cgit v1.2.3