Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (AM_CXXFLAGS): Define TOOLEXECLIBDIR. (libgcj0_convenience_la_SOURCES): Don't include gnu_xml_source_files. (libgcj0_convenience_la_LIBADD): New variable. (libgcj_la_LIBADD): Don't include sax or w3c_dom. (all_java_source_files): javax_imageio_source_files, javax_xml_source_files, and gnu_java_beans_source_files. ($(gnu_xml_source_files:.java=.lo)): Removed target. (gnu-xml.lo): New target. (javax-imageio.lo): Likewise. (javax-xml.lo): Likewise. (gnu-java-beans.lo): Likewise. (gnu_java_beans_source_files): New variable. (javax_imageio_source_files): Likewise. (javax_xml_source_files): Likewise. (javax_source_files): Moved files to other variable. (awt_java_source_files): Likewise. (ordinary_java_source_files): Added BootClassLoader.java. * java/lang/natVMClassLoader.cc (defineClass): Use boot loader, not system class loader. (initBootLoader): New method. (loadClass): Search bootLoader. * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Use boot loader, not system class loader. (_Jv_UnregisterInitiatingLoader): Likewise. (_Jv_FindClass): Likewise. Ensure entries in bootstrap_class_list are unique. * java/lang/natClass.cc (getClassLoader): Don't special case system class loader. * java/lang/VMClassLoader.java (bootLoader): New field. (getResource): Use bootLoader. (getResources): Likewise. (initBootLoader): Declare. * gnu/gcj/runtime/BootClassLoader.java: New file. * external/sax/org/xml/sax/helpers/NamespaceSupport.java (EMPTY_ENUMERATION): Now package-private. * external/w3c_com/Makefile.in: Rebuilt. * external/w3c_com/Makefile.am (MULTIBUILDTOP): New variable. (w3c.jar): New target. (classes.stamp): Updated. (toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES. Changed name of library. (libw3c_gcj_la_SOURCES): New variable. (libw3c_gcj_la_GCJFLAGS): Likewise. (source_files): Renamed from lib3c_convenience_la_SOURCES. * external/sax/Makefile.in: Rebuilt. * external/sax/Makefile.am (MULTIBUILDTOP): New variable. (sax.jar): New target. (classes.stamp): Updated. (toolexeclib_LTLIBRARIES): Renamed from noinst_LTLIBRARIES. Changed name of library. (libsax_gcj_la_SOURCES): New variable. (libsax_gcj_la_GCJFLAGS): Likewise. (source_files): Renamed from libsax_convenience_la_SOURCES. * stacktrace.cc (non_system_trace_fn): Don't look at system class loader. * prims.cc (_Jv_CreateJavaVM): Initialize the bootstrap class loader. (_Jv_RunMain): Handle case where 'runtime' is NULL at exit. From-SVN: r96960
This commit is contained in:
@@ -53,6 +53,7 @@ import java.util.Enumeration;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.StringTokenizer;
|
||||
import gnu.gcj.runtime.BootClassLoader;
|
||||
|
||||
/**
|
||||
* java.lang.VMClassLoader is a package-private helper for VMs to implement
|
||||
@@ -82,6 +83,10 @@ final class VMClassLoader
|
||||
|
||||
static final HashMap definedPackages = new HashMap();
|
||||
|
||||
// This is a helper for handling java.endorsed.dirs. It is null
|
||||
// until we've initialized the system, at which point it is created.
|
||||
static BootClassLoader bootLoader;
|
||||
|
||||
/**
|
||||
* Helper to define a class using a string of bytes. This assumes that
|
||||
* the security checks have already been performed, if necessary.
|
||||
@@ -153,6 +158,8 @@ final class VMClassLoader
|
||||
*/
|
||||
static URL getResource(String name)
|
||||
{
|
||||
if (bootLoader != null)
|
||||
return bootLoader.bootGetResource(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -168,6 +175,8 @@ final class VMClassLoader
|
||||
*/
|
||||
static Enumeration getResources(String name) throws IOException
|
||||
{
|
||||
if (bootLoader != null)
|
||||
return bootLoader.bootGetResources(name);
|
||||
return EmptyEnumeration.getInstance();
|
||||
}
|
||||
|
||||
@@ -287,6 +296,8 @@ final class VMClassLoader
|
||||
|
||||
static native ClassLoader getSystemClassLoaderInternal();
|
||||
|
||||
static native void initBootLoader(String libdir);
|
||||
|
||||
static ClassLoader getSystemClassLoader()
|
||||
{
|
||||
// This method is called as the initialization of systemClassLoader,
|
||||
@@ -310,6 +321,7 @@ final class VMClassLoader
|
||||
+ loader, ex);
|
||||
}
|
||||
}
|
||||
|
||||
return default_sys;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user