Skip to content

Commit

Permalink
openjdk11: update to 11.0.21+9
Browse files Browse the repository at this point in the history
  • Loading branch information
hadfl committed Dec 6, 2023
1 parent 61b34e4 commit 44f0af7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build/openjdk11/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
1 change: 1 addition & 0 deletions build/openjdk11/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions build/openjdk11/patches/tribblix-thrstat001.patch
Original file line number Diff line number Diff line change
@@ -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);
}

0 comments on commit 44f0af7

Please sign in to comment.