Forgot to commit this earlier.

From-SVN: r32775

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index a8bba0f9c1cc18d926e2c3123f8f47c6a837d4a2..7c39fe42791b6073b0a2ad28b2344b1486dcbd93 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1635,9 +1635,14 @@ java/lang/Thread.h: java/lang/Thread.class libgcj.zip
        $(GCJH) -classpath $(top_builddir) \
                -prepend 'class _Jv_JNIEnv;' \
                -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