java/openjdk18: Update to 18.0.2

This commit is contained in:
Greg Lewis 2022-08-02 19:19:45 -07:00
parent d1c89e6d05
commit 28b0ae0fe7
3 changed files with 5 additions and 43 deletions

View File

@ -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

View File

@ -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

View File

@ -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<>