diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-03-28 04:43:44 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-03-28 05:43:44 +0100 |
| commit | 8e4b9c9713984c220fb3e715ee6fa5d9148a3398 (patch) | |
| tree | 597afeca8778e65d6f23c55dd36254d64f5e74bb /libjava | |
| parent | eddad872399d1aa69d70d3290b529b6f0db543a9 (diff) | |
| download | gcc-8e4b9c9713984c220fb3e715ee6fa5d9148a3398.zip gcc-8e4b9c9713984c220fb3e715ee6fa5d9148a3398.tar.gz gcc-8e4b9c9713984c220fb3e715ee6fa5d9148a3398.tar.bz2 | |
Synchronized gcjh commands for java/lang/Thread.h with Makefile.in.
From-SVN: r32776
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 1 | ||||
| -rw-r--r-- | libjava/Makefile.am | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6aee33f..3b4e8e7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,6 +1,7 @@ 2000-03-27 Bryce McKinlay <bryce@albatross.co.nz> * Makefile.in: New #defines and friends for Thread.h. + * Makefile.am: Ditto. * posix-threads.cc: (struct starter): Remove `object'. (_Jv_CondWait): Use interruptable condition variables and new recursive mutexes. New return codes on interrupt or non-ownership diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4d0a16a..5a60b81 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -224,11 +224,15 @@ gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip 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; } } } };' \ + -prepend '#define _JV_NOT_OWNER 1' \ + -prepend '#define _JV_INTERRUPTED 2' \ -friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \ -friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \ -friend 'class gnu::gcj::jni::NativeThread;' \ + -friend 'int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos);' \ + -friend 'int _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu);' \ + -friend 'void _Jv_ThreadInterrupt (_Jv_Thread_t *data);' \ $(basename $<) java/lang/String.h: java/lang/String.class libgcj.zip |