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

prims.cc (_Jv_Abort): Always print error message using fprintf, don't try to allocate.

Browse source 
* prims.cc (_Jv_Abort): Always print error message using fprintf,
        don't try to allocate.
        (_Jv_CreateJavaVM): Set gcj::runTimeInitialized.
        * include/jvm.h (gcj::runTimeInitialized): New variable declaration.
        * java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault): Handle
        duplicate class registration with JvFail if the runtime hasn't been
        initialized yet.

From-SVN: r46424
This commit is contained in:
Bryce McKinlay 2001-10-23 05:42:03 +00:00 • committed by Bryce McKinlay
parent 187e37f9a6
commit afb2dec526
4 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libjava/prims.cc
View file

@ -299,10 +299,7 @@ _Jv_Abort (const char *, const char *, int, const char *message)
"libgcj failure: %s\n in function %s, file %s, line %d\n",
message, function, file, line);
#else
java::io::PrintStream *err = java::lang::System::err;
err->print(JvNewStringLatin1 ("libgcj failure: "));
err->println(JvNewStringLatin1 (message));
err->flush();
fprintf (stderr, "libgcj failure: %s\n", message);
#endif
abort ();
}
@ -872,6 +869,8 @@ namespace gcj
_Jv_Utf8Const *clinit_name;
_Jv_Utf8Const *init_name;
_Jv_Utf8Const *finit_name;
bool runtimeInitialized = false;
}
jint
@ -879,12 +878,10 @@ _Jv_CreateJavaVM (void* /*vm_args*/)
{
using namespace gcj;
static bool init = false;
if (init)
if (runtimeInitialized)
return -1;
init = true;
runtimeInitialized = true;
PROCESS_GCJ_PROPERTIES;