4 files changed, 70 insertions, 0 deletions

diff --git a/java/jdk13/files/patch-_pth.h b/java/jdk13/files/patch-_pth.h
new file mode 100644
index 000000000000..850957f8514d
--- /dev/null
+++ b/java/jdk13/files/patch-_pth.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h	11 Jul 2001 21:45:07 -0000	1.1.1.1
++++ ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h	22 Nov 2004 17:19:42 -0000
+@@ -52,7 +52,7 @@
+ #define PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init

+ #define PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy

+ #define PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))

+-#define PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))

++#define PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))

+ #define PTHREAD_CONDATTR_INIT         pthread_condattr_init

+ #define PTHREAD_CONDATTR_DESTROY      pthread_condattr_destroy

+ #define PTHREAD_COND_INIT(m, a)       pthread_cond_init(&(m), &(a))

diff --git a/java/jdk13/files/patch-monitor_md.c b/java/jdk13/files/patch-monitor_md.c
new file mode 100644
index 000000000000..b47390878e33
--- /dev/null
+++ b/java/jdk13/files/patch-monitor_md.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../src/solaris/hpi/native_threads/src/monitor_md.c	11 Jul 2001 21:42:33 -0000	1.1.1.1
++++ ../src/solaris/hpi/native_threads/src/monitor_md.c	22 Nov 2004 17:19:50 -0000
+@@ -132,7 +132,7 @@
+ 	mid->monitor_owner = self;
+ 	mid->entry_count = 1;
+ 	return SYS_OK;
+-    } else if (err == EBUSY) { /* it's already locked */
++    } else if (err == EBUSY || err == EDEADLK) { /* it's already locked */
+ 	if (mid->monitor_owner == self) {
+ 	    mid->entry_count++;
+ 	    return SYS_OK;
diff --git a/java/jdk13/files/patch-os_bsd.hpp b/java/jdk13/files/patch-os_bsd.hpp
new file mode 100644
index 000000000000..26609b5d816b
--- /dev/null
+++ b/java/jdk13/files/patch-os_bsd.hpp
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp	16 Jan 2002 18:46:39 -0000	1.2
++++ ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp	22 Nov 2004 17:19:42 -0000
+@@ -186,7 +186,7 @@
+     bool trylock() {
+       verify();
+       int status = pthread_mutex_trylock(_mutex);
+-      if (status == EBUSY)
++      if (status == EBUSY || status = EDEADLK)
+ 	return false;
+       assert(status == 0, "pthread_mutex_lock");
+       #ifndef PRODUCT
+@@ -349,7 +349,7 @@
+     bool trylock() {
+       verify();
+       int status = pthread_mutex_trylock(_mutex);
+-      if (status == EBUSY)
++      if (status == EBUSY || status = EDEADLK)
+ 	return false;
+       assert(status == 0, "pthread_mutex_trylock");
+       #ifndef PRODUCT
diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp
new file mode 100644
index 000000000000..f21e6129b5a2
--- /dev/null
+++ b/java/jdk13/files/patch-os_linux.hpp
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp	5 Jun 2002 05:27:47 -0000	1.4
++++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp	22 Nov 2004 17:19:42 -0000
+@@ -186,7 +186,7 @@
+     bool trylock() {
+       verify();
+       int status = os::Solaris::mutex_trylock(_mutex);
+-      if (status == EBUSY)
++      if (status == EBUSY || status == EDEADLK)
+ 	return false;
+       assert(status == 0, "mutex_lock");
+       return true;
+@@ -348,7 +348,7 @@
+     bool trylock() {
+       verify();
+       int status = os::Solaris::mutex_trylock(_mutex);
+-      if (status == EBUSY)
++      if (status == EBUSY || status == EDEADLK)
+ 	return false;
+       assert(status == 0, "mutex_trylock");
+       return true;