From 44f0af7ea6b7e78c952b1c7df35320f6328b3993 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Wed, 6 Dec 2023 18:22:46 +0000
Subject: [PATCH] openjdk11: update to 11.0.21+9

---
 build/openjdk11/build.sh                      |  2 +-
 build/openjdk11/patches/series                |  1 +
 .../patches/tribblix-thrstat001.patch         | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 build/openjdk11/patches/tribblix-thrstat001.patch

diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh
index f40ae6e568..e73c048b3c 100755
--- a/build/openjdk11/build.sh
+++ b/build/openjdk11/build.sh
@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=openjdk
-VER=11.0.20.1+1
+VER=11.0.21+9
 PKG=runtime/java/openjdk11
 SUMMARY="openjdk ${VER%%.*}"
 DESC="Open-source implementation of the eleventh edition of the "
diff --git a/build/openjdk11/patches/series b/build/openjdk11/patches/series
index 8555ccba8d..404d8c1769 100644
--- a/build/openjdk11/patches/series
+++ b/build/openjdk11/patches/series
@@ -36,6 +36,7 @@ tribblix-flags-ldflags2.patch
 tribblix-flags-ldflags3.patch
 tribblix-Launcher-jdk.patch
 tribblix-LauncherCommon.patch
+tribblix-thrstat001.patch
 omnios-headless.patch
 security-pkcs11.patch
 fontpath.patch
diff --git a/build/openjdk11/patches/tribblix-thrstat001.patch b/build/openjdk11/patches/tribblix-thrstat001.patch
new file mode 100644
index 0000000000..82bf9e86bf
--- /dev/null
+++ b/build/openjdk11/patches/tribblix-thrstat001.patch
@@ -0,0 +1,22 @@
+Local definition of wait() conflicts with wait(3C).
+
+--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Fri Oct  6 06:33:33 2023
++++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadState/thrstat001/thrstat001.cpp	Thu Oct 19 09:25:58 2023
+@@ -70,7 +70,7 @@
+ }
+ 
+ static void
+-wait(const char* func_name, jrawMonitorID lock, jint millis) {
++thrstat001wait(const char* func_name, jrawMonitorID lock, jint millis) {
+     jvmtiError err = jvmti->RawMonitorWait(lock, (jlong)millis);
+     if (err != JVMTI_ERROR_NONE) {
+         printf("%s: unexpected error in RawMonitorWait: %s (%d)\n",
+@@ -229,7 +229,7 @@
+             break;
+         }
+         lock("checkStatus", wait_lock);
+-        wait("checkStatus", wait_lock, millis);
++        thrstat001wait("checkStatus", wait_lock, millis);
+         unlock("checkStatus", wait_lock);
+     }
+