diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 16:44:49 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 16:44:49 +0000 |
| commit | 4e0814a1317aa0b71fb54340916d52a091149eb6 (patch) | |
| tree | cbee3ee9c2808ec4ca919383d4d076cbe8dce65d /libjava/gnu | |
| parent | 445973fa2b45ee4036e3cea6f3ce042d0c2b4675 (diff) | |
| download | gcc-4e0814a1317aa0b71fb54340916d52a091149eb6.tar.gz | |
2006-07-28 Andrew Haley <aph@redhat.com>
* gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set
curLoader to VMClassLoader::bootLoader.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115797 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/runtime/natSharedLibLoader.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 1dd33e94e1a..e20ccb9e336 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -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; |