diff options
| author | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-20 19:30:30 +0000 |
|---|---|---|
| committer | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-20 19:30:30 +0000 |
| commit | aa705a651c253c091706d2f38247c212a02f5154 (patch) | |
| tree | 74b5eb32122e2c9c320ddc672d207de4a0a96ef1 /libjava/jni.cc | |
| parent | 51c66eeef7c43fdd78be583137af303c4709b87a (diff) | |
| download | gcc-aa705a651c253c091706d2f38247c212a02f5154.tar.gz | |
* include/jvm.h (_Jv_GetJVMTIEnv): Declare.
* jni.cc (_Jv_JNI_GetEnv): Handle JVMTI requests.
* jvmti.cc: New file.
* Makefile.am (libgcj_la_SOURCES): Add jvmti.cc.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115629 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/jni.cc')
| -rw-r--r-- | libjava/jni.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libjava/jni.cc b/libjava/jni.cc index 67ba8fa4941..f7d73e55385 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -22,6 +22,7 @@ details. */ #ifdef ENABLE_JVMPI #include <jvmpi.h> #endif +#include <jvmti.h> #include <java/lang/Class.h> #include <java/lang/ClassLoader.h> @@ -2495,6 +2496,13 @@ _Jv_JNI_GetEnv (JavaVM *, void **penv, jint version) } #endif + // Handle JVMTI requests + if (version == JVMTI_VERSION_1_0) + { + *penv = (void *) _Jv_GetJVMTIEnv (); + return 0; + } + // FIXME: do we really want to support 1.1? if (version != JNI_VERSION_1_4 && version != JNI_VERSION_1_2 && version != JNI_VERSION_1_1) |