diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2025-04-24 11:21:34 -0300 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2025-04-25 12:26:59 -0300 |
| commit | 5fc04e4b900f974d5d334b1165668bddc90a86f6 (patch) | |
| tree | cbe9006e1b126583433eff662a8f77a051f1ec16 /java | |
| parent | sysutils/eza: Update to 0.21.2 (diff) | |
java/openjdk24: Upgrade to version 24.0.1+9.1
Remove src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp patch; it was
upstreamed.
Reviewed by: emaste, glewis, jrm
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D49996
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk24/Makefile | 6 | ||||
| -rw-r--r-- | java/openjdk24/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk24/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 44 |
3 files changed, 6 insertions, 50 deletions
diff --git a/java/openjdk24/Makefile b/java/openjdk24/Makefile index ec30590db8ca..a3a1acc22792 100644 --- a/java/openjdk24/Makefile +++ b/java/openjdk24/Makefile @@ -35,7 +35,7 @@ CPE_VENDOR= oracle USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= openjdk -GH_TAGNAME= jdk-24-ga-freebsd-1 +GH_TAGNAME= jdk-24.0.1-ga-freebsd-1 NO_CCACHE= yes @@ -60,8 +60,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 24 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 0 -JDK_BUILD_NUMBER= 36 +JDK_PATCH_VERSION= 1 +JDK_BUILD_NUMBER= 9 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 diff --git a/java/openjdk24/distinfo b/java/openjdk24/distinfo index d23e9b58d387..2fa838f9fba2 100644 --- a/java/openjdk24/distinfo +++ b/java/openjdk24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742895111 -SHA256 (freebsd-openjdk-jdk-24.0.0+36-1-jdk-24-ga-freebsd-1_GH0.tar.gz) = d2dc74549c4038bcab0b54622e98083d48989976e4f221ce53d265e785d16abf -SIZE (freebsd-openjdk-jdk-24.0.0+36-1-jdk-24-ga-freebsd-1_GH0.tar.gz) = 120821939 +TIMESTAMP = 1745490330 +SHA256 (freebsd-openjdk-jdk-24.0.1+9-1-jdk-24.0.1-ga-freebsd-1_GH0.tar.gz) = f9a5a14ba9205bcb6bced5a153d0d726d03c9ffdd459171683a9ade9ac31ea4e +SIZE (freebsd-openjdk-jdk-24.0.1+9-1-jdk-24.0.1-ga-freebsd-1_GH0.tar.gz) = 120804490 diff --git a/java/openjdk24/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk24/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index dda6fd26cce0..000000000000 --- a/java/openjdk24/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2024-04-11 22:23:08 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -61,6 +61,7 @@ - # include <sys/types.h> - # include <sys/mman.h> - # include <pthread.h> -+# include <pthread_np.h> - # include <signal.h> - # include <errno.h> - # include <dlfcn.h> -@@ -432,6 +433,33 @@ size_t os::Posix::default_stack_size(os::ThreadType th - // Default stack size (compiler thread needs larger stack). - size_t s = (thr_type == os::compiler_thread ? 4 * M : 1024 * K); - return s; -+} -+ -+void os::current_stack_base_and_size(address* base, size_t* size) { -+ address bottom; -+ pthread_attr_t attr; -+ -+ int rslt = pthread_attr_init(&attr); -+ -+ // JVM needs to know exact stack location, abort if it fails -+ if (rslt != 0) -+ fatal("pthread_attr_init failed with error = %d", rslt); -+ -+ rslt = pthread_attr_get_np(pthread_self(), &attr); -+ -+ if (rslt != 0) -+ fatal("pthread_attr_get_np failed with error = %d", rslt); -+ -+ if (pthread_attr_getstackaddr(&attr, (void **)&bottom) != 0 || -+ pthread_attr_getstacksize(&attr, size) != 0) { -+ fatal("Can not locate current stack attributes!"); -+ } -+ -+ *base = bottom + *size; -+ -+ pthread_attr_destroy(&attr); -+ assert(os::current_stack_pointer() >= bottom && -+ os::current_stack_pointer() < *base, "just checking"); - } - - ///////////////////////////////////////////////////////////////////////////// |