From: Tom Tromey <tromey@cygnus.com>
Date: Thu, 10 Feb 2000 00:17:10 +0000 (+0000)
Subject: natRuntime.cc (_load): Call add_library.
X-Git-Tag: prereleases/libstdc++-2.92~8311
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e3b6e312a9f2060a707ab279e236fc464d9f518;p=thirdparty%2Fgcc.git

natRuntime.cc (_load): Call add_library.

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

From-SVN: r31877
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 94a1543ef55e..353e6298418a 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 d391ff42d6ba..f21a81f10502 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;