Makefile.in: Rebuilt.
* Makefile.in: Rebuilt. * Makefile.am (java/lang/ClassLoader.h): New target. * java/lang/natClassLoader.cc (_Jv_FindClass): Removed reference to `redirect'. * include/java-props.h (_Jv_Compiler_Properties): Changed declaration. * gcj/array.h (JvRunMain, _Jv_RunMain): Don't declare. * include/jvm.h (_Jv_GCSetInitialHeapSize, _Jv_GCSetMaximumHeapSize): Declare. (JvRunMain, _Jv_RunMain): Declare. (_Jv_SetMaximumHeapSize, _Jv_SetInitialHeapSize): Declare. * nogc.cc (_Jv_GCSetInitialHeapSize): New function. (_Jv_GCSetMaximumHeapSize): Likewise. * boehm.cc (_Jv_GCSetInitialHeapSize): New function. (_Jv_GCSetMaximumHeapSize): Likewise. * prims.cc (parse_heap_size): New function. (_Jv_SetInitialHeapSize): Likewise. (_Jv_SetMaximumHeapSize): Likewise. (_Jv_Compiler_Properties): New global. * gij.cc (help): New function. (version): Likewise. (heap_size): Likewise. (heap_max_size): Likewise. (main): Parse arguments. Set _Jv_Compiler_Properties. Include <config.h>, <java-props.h>. (_Jv_Compiler_Properties): Removed. From-SVN: r30133
This commit is contained in:
parent
2fca54beb2
commit
b8c3c4f014
11 changed files with 229 additions and 26 deletions
|
@ -447,20 +447,19 @@ jclass _Jv_FindClass (_Jv_Utf8Const *name,
|
|||
}
|
||||
else
|
||||
{
|
||||
if (redirect == NULL)
|
||||
java::lang::ClassLoader *sys = java::lang::ClassLoader::system;
|
||||
if (sys == NULL)
|
||||
{
|
||||
_Jv_InitClass (&ClassLoaderClass);
|
||||
java::lang::ClassLoader::getSystemClassLoader ();
|
||||
sys = java::lang::ClassLoader::getSystemClassLoader ();
|
||||
}
|
||||
|
||||
// Load using the bootstrap loader jmspec 5.3.1
|
||||
klass = redirect -> loadClass (sname, false);
|
||||
// Load using the bootstrap loader jmspec 5.3.1.
|
||||
klass = sys->loadClass (sname, false);
|
||||
|
||||
// register that we're an initiating loader
|
||||
// Register that we're an initiating loader.
|
||||
if (klass)
|
||||
{
|
||||
_Jv_RegisterInitiatingLoader (klass, 0);
|
||||
}
|
||||
_Jv_RegisterInitiatingLoader (klass, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue