FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natRuntime.cc (_load): Call add_library.

Browse source 
* java/lang/natRuntime.cc (_load): Call add_library.
	(loadLibraryInternal): Likewise.

From-SVN: r31877
This commit is contained in:
Tom Tromey 2000-02-10 00:17:10 +00:00 • committed by Tom Tromey
parent c56c8c43b9
commit 7e3b6e312a
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libjava/ChangeLog
View file

@ -1,5 +1,8 @@
2000-02-09 Tom Tromey <tromey@cygnus.com> 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 * gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call
iconv_close when handle is not NULL. Thanks to Andrew Haley. iconv_close when handle is not NULL. Thanks to Andrew Haley.
(Output_iconv::finalize): Likewise. (Output_iconv::finalize): Likewise.

4
libjava/java/lang/natRuntime.cc
View file

@ -119,6 +119,8 @@ java::lang::Runtime::_load (jstring path, jboolean do_search)
_Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg))); _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg)));
} }
add_library (h);
void *onload = lt_dlsym (h, "JNI_OnLoad"); void *onload = lt_dlsym (h, "JNI_OnLoad");
if (onload != NULL) if (onload != NULL)
{ {
@ -150,6 +152,8 @@ java::lang::Runtime::loadLibraryInternal (jstring lib)
buf[total] = '\0'; buf[total] = '\0';
// FIXME: make sure path is absolute. // FIXME: make sure path is absolute.
lt_dlhandle h = lt_dlopenext (buf); lt_dlhandle h = lt_dlopenext (buf);
if (h != NULL)
add_library (h);
return h != NULL; return h != NULL;
#else #else
return false; return false;