natSharedLibLoader.cc (init): Don't set curLoader to VMClassLoader::bootLoader.
2006-07-28 Andrew Haley <aph@redhat.com> * gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set curLoader to VMClassLoader::bootLoader. From-SVN: r115797
This commit is contained in:
parent
464fc7a199
commit
8f2cc5b59b
|
@ -1,3 +1,8 @@
|
||||||
|
2006-07-28 Andrew Haley <aph@redhat.com>
|
||||||
|
|
||||||
|
* gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set
|
||||||
|
curLoader to VMClassLoader::bootLoader.
|
||||||
|
|
||||||
2006-07-28 Gary Benson <gbenson@redhat.com>
|
2006-07-28 Gary Benson <gbenson@redhat.com>
|
||||||
Casey Marshall <csm@gnu.org>
|
Casey Marshall <csm@gnu.org>
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,8 @@ details. */
|
||||||
#include <java/lang/UnsupportedOperationException.h>
|
#include <java/lang/UnsupportedOperationException.h>
|
||||||
#include <java/lang/UnknownError.h>
|
#include <java/lang/UnknownError.h>
|
||||||
|
|
||||||
|
#include <java/lang/VMClassLoader.h>
|
||||||
|
|
||||||
// If we're using the Boehm GC, then we need this include to override dlopen.
|
// If we're using the Boehm GC, then we need this include to override dlopen.
|
||||||
#ifdef HAVE_BOEHM_GC
|
#ifdef HAVE_BOEHM_GC
|
||||||
// Set GC_DEBUG before including gc.h!
|
// Set GC_DEBUG before including gc.h!
|
||||||
|
@ -87,7 +89,8 @@ gnu::gcj::runtime::SharedLibHelper::init(void)
|
||||||
flags = RTLD_GLOBAL | RTLD_LAZY;
|
flags = RTLD_GLOBAL | RTLD_LAZY;
|
||||||
JvSynchronize dummy1(&java::lang::Class::class$);
|
JvSynchronize dummy1(&java::lang::Class::class$);
|
||||||
SharedLibDummy dummy2;
|
SharedLibDummy dummy2;
|
||||||
curLoader = loader;
|
curLoader = ((void*)loader == java::lang::VMClassLoader::bootLoader
|
||||||
|
? NULL : loader);
|
||||||
curHelper = this;
|
curHelper = this;
|
||||||
_Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
|
_Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
|
||||||
_Jv_RegisterCoreHook = core_hook;
|
_Jv_RegisterCoreHook = core_hook;
|
||||||
|
|
Loading…
Reference in New Issue