diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-02-10 20:31:48 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-02-10 20:31:48 +0000 |
| commit | aaf0766e9f897b2fbce053083d85cb739cb509d2 (patch) | |
| tree | 893852baae8ef6aa653f36d94ed11d6728aa30ea /libjava/Makefile.am | |
| parent | ef86eabb6c290a9d77d74d63f2b5041a096841d9 (diff) | |
| download | gcc-aaf0766e9f897b2fbce053083d85cb739cb509d2.zip gcc-aaf0766e9f897b2fbce053083d85cb739cb509d2.tar.gz gcc-aaf0766e9f897b2fbce053083d85cb739cb509d2.tar.bz2 | |
natNativeThread.cc: New file.
* gnu/gcj/jni/natNativeThread.cc: New file.
* gnu/gcj/jni/NativeThread.java: New file.
* java/lang/Thread.java (data): Now a RawData.
* include/jvm.h (_Jv_GetCurrentJNIEnv, _Jv_SetCurrentJNIEnv):
Declare.
* Makefile.in: Rebuilt.
* Makefile.am (java/lang/Thread.h): New target.
(ordinary_java_source_files): Added NativeThread.java.
(nat_source_files): Added natNativeThread.cc.
* java/lang/natThread.cc: Include <jni.h>
(struct natThread): Added `jni_env' field.
(_Jv_GetCurrentJNIEnv): New function.
(_Jv_SetCurrentJNIEnv): Likewise.
(initialize_native): Initialize jni_env.
Include RawData.h.
* jni.cc (ThreadGroupClass): New define.
(_Jv_JNI_InvokeFunctions): New structure.
(JNI_GetCreatedJavaVMs): New function.
(the_vm): New global.
(JNI_GetDefaultJavaVMInitArgs): New function.
Include NativeThread.h.
(NativeThreadClass): New define.
(_Jv_JNI_EnsureLocalCapacity): Return JNI_ERR, not -1.
(_Jv_JNI_DestroyJavaVM): New function.
(_Jv_JNI_AttachCurrentThread): New function.
(_Jv_JNI_DetachCurrentThread): New function.
(_Jv_JNI_GetEnv): New function.
(JNI_CreateJavaVM): New function.
(_Jv_JNI_GetJavaVM): New function.
(_Jv_JNIFunctions): Added entry for GetJavaVM.
* include/jni.h (JavaVMAttachArgs): New structure.
(JNI_EDETACHED): New define.
(JNI_EVERSION): Likewise.
(JavaVM): Define properly.
(struct JNIInvokeInterface): New structure.
(class _Jv_JavaVM): New class.
(JNI_OnLoad, JNI_OnUnload): Declare.
(JNI_GetDefaultJavaVMInitArgs, JNI_CreateJavaVM,
JNI_GetCreatedJavaVMs): Declare.
(JavaVMInitArgs): New typedef.
(JavaVMOption): Likewise.
(JNI_ERR): New define.
(JNI_OK): Likewise.
From-SVN: r31901
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4abbeab..c22a2c8 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -221,6 +221,16 @@ java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip -friend 'void _Jv_RunMain (const char*, int, const char **);' \ $(basename $<) +java/lang/Thread.h: java/lang/Thread.class libgcj.zip + $(GCJH) -classpath $(top_builddir) \ + -prepend 'class _Jv_JNIEnv;' \ +## Eww. + -prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \ + -friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ + -friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ + -friend 'class gnu::gcj::jni::NativeThread;' \ + $(basename $<) + java/lang/String.h: java/lang/String.class libgcj.zip $(GCJH) -classpath $(top_builddir) \ -friend 'jchar* _Jv_GetStringChars (jstring str);' \ @@ -512,6 +522,7 @@ built_java_source_files = java/lang/ConcreteProcess.java ## convert_source_files. If the .java file has a hand-maintained ## header, please list it in special_java_source_files. ordinary_java_source_files = $(convert_source_files) \ +gnu/gcj/jni/NativeThread.java \ gnu/gcj/runtime/MethodInvocation.java \ gnu/gcj/runtime/VMClassLoader.java \ gnu/gcj/text/BaseBreakIterator.java \ @@ -796,6 +807,7 @@ gnu/gcj/convert/natInput_EUCJIS.cc \ gnu/gcj/convert/natInput_SJIS.cc \ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ +gnu/gcj/jni/natNativeThread.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/lang/natCharacter.cc \ |