From 380cddab526fcf3c2f33dc8ebeb61c2d42703f41 Mon Sep 17 00:00:00 2001 From: bryce Date: Tue, 16 Oct 2001 08:35:17 +0000 Subject: Eliminate use of C++ static constructors. * interpret.cc: Remove static Utf8Consts. Use namespace gcj. * jni.cc: Likewise. * resolve.cc: Likewise. * defineclass.cc: Likewise. (_Jv_ClassReader::handleClassBegin): Synchronize call to _Jv_RegisterClass. * include/jvm.h (void_signature, clinit_name, init_name, finit_name): Declare in namespace gcj. * java/lang/Class.h (Class): Remove initialization for primitive types. (friend void _Jv_InitPrimClass): This is in prims.cc. * prims.cc (_Jv_InitPrimClass): Do primitive type initialization here instead. (void_signature, clinit_name, init_name, finit_name): Define in namespace gcj. (_Jv_CreateJavaVM): Call _Jv_InitThreads, _Jv_InitGC, and _Jv_InitializeSyncMutex from here. Initialize Utf8 constants. Initialize primitive types. * java/lang/natClassLoader.cc (_Jv_RegisterClasses): Don't call initialization routines. Don't synchronize. * java/lang/natRuntime.cc (_load): Synchronize on java.lang.Class across dlopen call. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46282 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/interpret.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libjava/interpret.cc') diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 42c342a3281..5bfe4e7fbba 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -37,7 +37,7 @@ details. */ #include -static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("", 6); +using namespace gcj; static void throw_internal_error (char *msg) __attribute__ ((__noreturn__)); -- cgit v1.2.3