diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2022-08-03 05:19:45 +0300 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2022-08-03 05:27:22 +0300 |
| commit | 28b0ae0fe75ee2f922efdb853faa2ce735002546 (patch) | |
| tree | 5a0b3b8bf7202691559d67263ab990c80b198744 /java | |
| parent | d1c89e6d05946f7d52f9faf679b8f21609b3d0e7 (diff) | |
java/openjdk18: Update to 18.0.2
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk18/Makefile | 4 | ||||
| -rw-r--r-- | java/openjdk18/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp | 38 |
3 files changed, 5 insertions, 43 deletions
diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile index a917e99c2dfe..a5873a76259e 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -61,8 +61,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 18 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 1 -JDK_BUILD_NUMBER= 10 +JDK_PATCH_VERSION= 2 +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/openjdk18/distinfo b/java/openjdk18/distinfo index c7f3db070142..69499290784a 100644 --- a/java/openjdk18/distinfo +++ b/java/openjdk18/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651718961 -SHA256 (battleblow-jdk18u-jdk-18.0.1+10-1_GH0.tar.gz) = 3c95f7d8cad401ea03e60b0f4f952509b3528f98007603f167cf306d19204832 -SIZE (battleblow-jdk18u-jdk-18.0.1+10-1_GH0.tar.gz) = 105555943 +TIMESTAMP = 1659446153 +SHA256 (battleblow-jdk18u-jdk-18.0.2+9-1_GH0.tar.gz) = ad941ee9407015986f26cd7c6be60fb460d87ab7b87c7cbfe75e6f31711be501 +SIZE (battleblow-jdk18u-jdk-18.0.2+9-1_GH0.tar.gz) = 105593810 diff --git a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp deleted file mode 100644 index a71932f53fe2..000000000000 --- a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp -+++ src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp -@@ -184,9 +184,14 @@ inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value, - atomic_memory_order order) const { - STATIC_ASSERT(4 == sizeof(I)); - STATIC_ASSERT(4 == sizeof(D)); -- D old_value -- = atomic_fastcall(aarch64_atomic_fetch_add_4_impl, dest, add_value); -- return old_value; -+ aarch64_atomic_stub_t stub; -+ switch (order) { -+ case memory_order_relaxed: -+ stub = aarch64_atomic_fetch_add_4_relaxed_impl; break; -+ default: -+ stub = aarch64_atomic_fetch_add_4_impl; break; -+ } -+ return atomic_fastcall(stub, dest, add_value); - } - - template<> -@@ -195,9 +200,14 @@ inline D Atomic::PlatformAdd<8>::fetch_and_add(D volatile* dest, I add_value, - atomic_memory_order order) const { - STATIC_ASSERT(8 == sizeof(I)); - STATIC_ASSERT(8 == sizeof(D)); -- D old_value -- = atomic_fastcall(aarch64_atomic_fetch_add_8_impl, dest, add_value); -- return old_value; -+ aarch64_atomic_stub_t stub; -+ switch (order) { -+ case memory_order_relaxed: -+ stub = aarch64_atomic_fetch_add_8_relaxed_impl; break; -+ default: -+ stub = aarch64_atomic_fetch_add_8_impl; break; -+ } -+ return atomic_fastcall(stub, dest, add_value); - } - - template<> |