Index: include/jvm.h =================================================================== --- include/jvm.h (revision 119467) +++ include/jvm.h (working copy) @@ -775,9 +775,10 @@ // These are used by Unsafe.park() and Unsafe.unpark(). volatile obj_addr_t park_permit; +/* pthread_mutex_t park_mutex; pthread_cond_t park_cond; - +*/ // This is private data for the thread system layer. _Jv_Thread_t *thread; Index: sun/misc/natUnsafe.cc =================================================================== --- sun/misc/natUnsafe.cc (revision 119467) +++ sun/misc/natUnsafe.cc (working copy) @@ -238,11 +238,11 @@ void sun::misc::Unsafe::unpark (::java::lang::Thread *thread) { - _Jv_ThreadUnpark (thread); +// _Jv_ThreadUnpark (thread); } void sun::misc::Unsafe::park (jboolean isAbsolute, jlong time) { - _Jv_ThreadPark (isAbsolute, time); +// _Jv_ThreadPark (isAbsolute, time); } Index: gnu/gcj/runtime/natSharedLibLoader.cc =================================================================== --- gnu/gcj/runtime/natSharedLibLoader.cc (revision 119467) +++ gnu/gcj/runtime/natSharedLibLoader.cc (working copy) @@ -104,7 +104,7 @@ #else const char *msg = "shared library class loading is not supported on this platform"; - throw new java::lang::UnsupportedOperationException(JvNewStringLatin1(msg)); + throw new ::java::lang::UnsupportedOperationException(JvNewStringLatin1(msg)); #endif } Index: java/lang/natThread.cc =================================================================== --- java/lang/natThread.cc (revision 119467) +++ java/lang/natThread.cc (working copy) @@ -54,8 +54,8 @@ _Jv_MutexInit (&nt->join_mutex); _Jv_CondInit (&nt->join_cond); - pthread_mutex_init (&nt->park_mutex, NULL); - pthread_cond_init (&nt->park_cond, NULL); +// pthread_mutex_init (&nt->park_mutex, NULL); +// pthread_cond_init (&nt->park_cond, NULL); nt->thread = _Jv_ThreadInitData (this); // FIXME: if JNI_ENV is set we will want to free it. It is @@ -76,8 +76,8 @@ #endif _Jv_FreeJNIEnv((JNIEnv*)nt->jni_env); - pthread_mutex_destroy (&nt->park_mutex); - pthread_cond_destroy (&nt->park_cond); +// pthread_mutex_destroy (&nt->park_mutex); +// pthread_cond_destroy (&nt->park_cond); } jint @@ -131,7 +131,7 @@ // Even though we've interrupted this thread, it might still be // parked. - _Jv_ThreadUnpark (this); +// _Jv_ThreadUnpark (this); } } Index: java/lang/natRuntime.cc =================================================================== --- java/lang/natRuntime.cc (revision 119467) +++ java/lang/natRuntime.cc (working copy) @@ -290,7 +290,7 @@ jstringArray env, java::io::File *dir) { - return new _Jv_platform_process (cmd, env, dir); + return new ::java::lang::Win32Process (cmd, env, dir); } jint