diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-10 00:17:10 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-10 00:17:10 +0000 |
| commit | d8049ed269a3e4e1b29eb24fd7383cc5c3a32d45 (patch) | |
| tree | 8824435a02a448b3bd1c961029b40e7eef6802a0 /libjava | |
| parent | 4202aa6d5cf2cb15d401a0c002baac81389bda8f (diff) | |
| download | ppe42-gcc-d8049ed269a3e4e1b29eb24fd7383cc5c3a32d45.tar.gz ppe42-gcc-d8049ed269a3e4e1b29eb24fd7383cc5c3a32d45.zip | |
* java/lang/natRuntime.cc (_load): Call add_library.
(loadLibraryInternal): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31877 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 94a1543ef55..353e6298418 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2000-02-09 Tom Tromey <tromey@cygnus.com> + * java/lang/natRuntime.cc (_load): Call add_library. + (loadLibraryInternal): Likewise. + * gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call iconv_close when handle is not NULL. Thanks to Andrew Haley. (Output_iconv::finalize): Likewise. diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index d391ff42d6b..f21a81f1050 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -119,6 +119,8 @@ java::lang::Runtime::_load (jstring path, jboolean do_search) _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg))); } + add_library (h); + void *onload = lt_dlsym (h, "JNI_OnLoad"); if (onload != NULL) { @@ -150,6 +152,8 @@ java::lang::Runtime::loadLibraryInternal (jstring lib) buf[total] = '\0'; // FIXME: make sure path is absolute. lt_dlhandle h = lt_dlopenext (buf); + if (h != NULL) + add_library (h); return h != NULL; #else return false; |
