diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e6d1bbb69ac..b6cbcf088fe 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-27  Marco Trudel  <mtrudel@gmx.ch>
+
+	* boehm.cc (_Jv_SuspendThread, _Jv_ResumeThread): Define
+	conditionally on GC_PTHREADS, !GC_SOLARIS_THREADS,
+	!GC_WIN32_THREADS and !GC_DARWIN_THREADS.
+
 2006-06-27  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/28178:
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 7b2c031730b..b8bd3a11e18 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -673,6 +673,9 @@ _Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__)))
 #endif
 }
 
+#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
+  && !defined(GC_WIN32_THREADS) && !defined(GC_DARWIN_THREADS)
+
 void
 _Jv_SuspendThread (_Jv_Thread_t *thread)
 {
@@ -684,3 +687,5 @@ _Jv_ResumeThread (_Jv_Thread_t *thread)
 {
   GC_resume_thread (_Jv_GetPlatformThreadID (thread));
 }
+
+#endif