Skip to content

Commit

Permalink
openjdk17: update from 17.0.9+9 17.0.10+7
Browse files Browse the repository at this point in the history
  • Loading branch information
citrus-it committed Jan 25, 2024
1 parent 970581e commit 50766e8
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build/openjdk17/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=openjdk
VER=17.0.9+9
VER=17.0.10+7
PKG=runtime/java/openjdk17
SUMMARY="openjdk ${VER%%.*}"
DESC="Open-source implementation of the seventeenth edition of the "
Expand Down
33 changes: 33 additions & 0 deletions build/openjdk17/patches/illumos-port-18.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
While we do have stafs(2) it has a different signature, is deprecated and
undocumented, while statvfs() gives the behaviour we actually want.

--- a/test/jdk/java/io/File/libGetXSpace.c Wed Apr 5 22:54:38 2023
+++ b/test/jdk/java/io/File/libGetXSpace.c Thu Apr 6 14:28:43 2023
@@ -34,9 +34,13 @@
#include <sys/param.h>
#include <sys/mount.h>
#else
+#ifdef __sun__
+#include <sys/statvfs.h>
+#else
#include <sys/statfs.h>
#endif
#endif
+#endif

#ifdef __cplusplus
extern "C" {
@@ -142,8 +146,13 @@
chars[len] = '\0';
(*env)->ReleaseStringChars(env, root, strchars);

+#ifdef __sun__
+ struct statvfs buf;
+ int result = statvfs((const char*)chars, &buf);
+#else
struct statfs buf;
int result = statfs((const char*)chars, &buf);
+#endif
free(chars);
if (result < 0) {
JNU_ThrowByNameWithLastError(env, "java/lang/RuntimeException",
8 changes: 4 additions & 4 deletions build/openjdk17/patches/java-solaris-sparc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -988,11 +988,11 @@
@@ -36,7 +36,6 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -ljava, \
LIBS_unix := -ljava, \
- LIBS_solaris := -lsocket, \
LIBS_linux := -ljvm, \
LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB), \
))

--- old/make/modules/jdk.sctp/Lib.gmk 2020-05-20 17:59:26.921438651 -0700
+++ new/make/modules/jdk.sctp/Lib.gmk 2020-05-20 17:59:26.541431354 -0700
@@ -44,7 +44,6 @@
Expand Down Expand Up @@ -1488,10 +1488,10 @@
-
-#define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
+#define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail) ? \
NativeCallStack(0) : NativeCallStack::empty_stack())
NativeCallStack(0) : FAKE_CALLSTACK)
-#define CALLER_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \
+#define CALLER_PC ((MemTracker::tracking_level() == NMT_detail) ? \
NativeCallStack(1) : NativeCallStack::empty_stack())
NativeCallStack(1) : FAKE_CALLSTACK)

class MemBaseline;
--- old/src/hotspot/share/utilities/debug.cpp 2020-05-20 18:00:41.782876045 -0700
Expand Down
1 change: 1 addition & 0 deletions build/openjdk17/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ illumos-port-14.patch
illumos-port-15.patch
illumos-port-16.patch
illumos-port-17.patch
illumos-port-18.patch
illumos-signal-1.patch
illumos-signal-2.patch
illumos-signal-3.patch
Expand Down

0 comments on commit 50766e8

Please sign in to comment.