diff options
| author | Andrew Haley <aph@redhat.com> | 2006-07-28 16:44:49 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2006-07-28 16:44:49 +0000 |
| commit | 8f2cc5b59bd35f2cac909fbe84cb6093be3121e5 (patch) | |
| tree | cbee3ee9c2808ec4ca919383d4d076cbe8dce65d /libjava/gnu | |
| parent | 464fc7a19978df2b22cf8683279cd1f14a161a6e (diff) | |
| download | gcc-8f2cc5b59bd35f2cac909fbe84cb6093be3121e5.zip gcc-8f2cc5b59bd35f2cac909fbe84cb6093be3121e5.tar.gz gcc-8f2cc5b59bd35f2cac909fbe84cb6093be3121e5.tar.bz2 | |
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
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 1dd33e9..e20ccb9 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; |