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

natSharedLibLoader.cc (init): `libname' now a String.

Browse source 
2003-07-20  Steve Pribyl <steve@netfuel.com.>

	* gnu/gcj/runtime/natSharedLibLoader.cc (init): `libname' now a
	String.  Put dlerror() message into exception.
	Include UnsatisfiedLinkError.
	* gnu/gcj/runtime/SharedLibLoader.java (init): `libname' now a
	String.  Now native.

From-SVN: r69622
This commit is contained in:
Steve Pribyl 2003-07-21 02:09:47 +00:00 • committed by Tom Tromey
parent ffd94572f4
commit 8ec880749f
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/ChangeLog
View file

@ -1,3 +1,11 @@
2003-07-20 Steve Pribyl <steve@netfuel.com.>
* gnu/gcj/runtime/natSharedLibLoader.cc (init): `libname' now a
String. Put dlerror() message into exception.
Include UnsatisfiedLinkError.
* gnu/gcj/runtime/SharedLibLoader.java (init): `libname' now a
String. Now native.
2003-07-20 Tom Tromey <tromey@redhat.com> 2003-07-20 Tom Tromey <tromey@redhat.com>
* java/lang/Runtime.java: Comment fix. * java/lang/Runtime.java: Comment fix.

7
libjava/gnu/gcj/runtime/SharedLibLoader.java
View file

@ -45,12 +45,7 @@ public class SharedLibLoader extends ClassLoader
init(libname, 0); init(libname, 0);
} }
void init(String libname, int flags) native void init(String libname, int flags);
{
init(libname.getBytes(), flags);
}
native void init(byte[] libname, int flags);
public Class loadClass(String name) public Class loadClass(String name)
throws ClassNotFoundException throws ClassNotFoundException

13
libjava/gnu/gcj/runtime/natSharedLibLoader.cc
View file

@ -14,6 +14,7 @@ details. */
#include <gnu/gcj/runtime/SharedLibLoader.h> #include <gnu/gcj/runtime/SharedLibLoader.h>
#include <java/io/IOException.h> #include <java/io/IOException.h>
#include <java/lang/UnsupportedOperationException.h> #include <java/lang/UnsupportedOperationException.h>
#include <java/lang/UnsatisfiedLinkError.h>
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
#include <dlfcn.h> #include <dlfcn.h>
@ -45,10 +46,14 @@ struct SharedLibDummy
#endif #endif
void void
gnu::gcj::runtime::SharedLibLoader::init(jbyteArray libname, jint flags) gnu::gcj::runtime::SharedLibLoader::init(jstring libname, jint flags)
{ {
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
char *lname = (char*) elements(libname); jint len = _Jv_GetStringUTFLength (libname);
char lname[len + 1];
JvGetStringUTFRegion (libname, 0, libname->length(), lname);
lname[len] = '\0';
if (flags==0) if (flags==0)
flags = RTLD_LAZY; flags = RTLD_LAZY;
JvSynchronize dummy1(&java::lang::Class::class$); JvSynchronize dummy1(&java::lang::Class::class$);
@ -59,6 +64,10 @@ gnu::gcj::runtime::SharedLibLoader::init(jbyteArray libname, jint flags)
if (h == NULL) if (h == NULL)
{ {
const char *msg = dlerror(); const char *msg = dlerror();
jstring str = JvNewStringLatin1 (lname);
str = str->concat (JvNewStringLatin1 (": "));
str = str->concat (JvNewStringLatin1 (msg));
throw new java::lang::UnsatisfiedLinkError (str);
} }
handler = (gnu::gcj::RawData*) h; handler = (gnu::gcj::RawData*) h;
#else #else