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

re PR libgcj/19681 (extension loading currently incorrect)

Browse source 
PR libgcj/19681:
	* Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Added new class.
	* java/lang/natVMClassLoader.cc (getSystemClassLoaderInternal):
	Use system_instance, not instance.
	* gnu/gcj/runtime/SystemClassLoader.java: New file.
	* gnu/gcj/runtime/VMClassLoader.java (init): Don't search
	java.class.path.
	(system_instance): New field.
	(initialize): Initialize the system loader as well.
	(VMClassLoader): Default to LIB_CACHE.

From-SVN: r94611
This commit is contained in:
Tom Tromey 2005-02-02 20:59:41 +00:00 • committed by Tom Tromey
parent 7ded35b4c2
commit 6d27fe75d0
7 changed files with 101 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libjava/java/lang/VMClassLoader.java
View file

@ -40,15 +40,19 @@ package java.lang;
import gnu.java.util.EmptyEnumeration;
import java.lang.reflect.Constructor;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AllPermission;
import java.security.Permission;
import java.security.Permissions;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
/**
* java.lang.VMClassLoader is a package-private helper for VMs to implement

3
libjava/java/lang/natVMClassLoader.cc
View file

@ -24,6 +24,7 @@ details. */
#include <java/lang/VMClassLoader.h>
#include <java/lang/VMCompiler.h>
#include <gnu/gcj/runtime/VMClassLoader.h>
#include <gnu/gcj/runtime/SystemClassLoader.h>
#include <java/lang/ClassLoader.h>
#include <java/lang/Class.h>
#include <java/lang/Throwable.h>
@ -114,7 +115,7 @@ java::lang::ClassLoader *
java::lang::VMClassLoader::getSystemClassLoaderInternal()
{
_Jv_InitClass (&gnu::gcj::runtime::VMClassLoader::class$);
return gnu::gcj::runtime::VMClassLoader::instance;
return gnu::gcj::runtime::VMClassLoader::system_instance;
}
jclass