OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Andrew Haley 2006-07-28 16:44:49 +00:00 committed by Andrew Haley
parent 464fc7a199
commit 8f2cc5b59b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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>
Casey Marshall <csm@gnu.org>

5
libjava/gnu/gcj/runtime/natSharedLibLoader.cc
View File

@ -20,6 +20,8 @@ details. */
#include <java/lang/UnsupportedOperationException.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.
#ifdef HAVE_BOEHM_GC
// Set GC_DEBUG before including gc.h!
@ -87,7 +89,8 @@ gnu::gcj::runtime::SharedLibHelper::init(void)
flags = RTLD_GLOBAL | RTLD_LAZY;
JvSynchronize dummy1(&java::lang::Class::class$);
SharedLibDummy dummy2;
curLoader = loader;
curLoader = ((void*)loader == java::lang::VMClassLoader::bootLoader
? NULL : loader);
curHelper = this;
_Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
_Jv_RegisterCoreHook = core_hook;