<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd9dd76e81bf5830adeef9f2ea475452d329b95f">https://github.com/macports/macports-ports/commit/fd9dd76e81bf5830adeef9f2ea475452d329b95f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fd9dd76e81b openjdk18: update to 18.0.2
</span>fd9dd76e81b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd9dd76e81bf5830adeef9f2ea475452d329b95f
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Tue Jul 26 23:40:59 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk18: update to 18.0.2
</span>---
java/openjdk18/Portfile | 16 +++++-----
...OS-hotspot-arm64-bug-exposed-by-latest-cl.patch | 35 ----------------------
2 files changed, 7 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18/Portfile b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 993381ccf73..51408498dc6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,24 +4,24 @@ PortSystem 1.0
</span>
name openjdk18
# https://github.com/openjdk/jdk18u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 18.0.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set build 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 18.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build 9
</span> revision 0
categories java devel
platforms darwin
supported_archs x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Openjdk 18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description JDK 18 builds of Openjdk, the Open-Source implementation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description OpenJDK 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description JDK 18 builds of OpenJDK, the Open-Source implementation \
</span> of the Java Platform, Standard Edition, and related projects.
homepage https://openjdk.java.net/
master_sites https://git.openjdk.java.net/jdk18u/archive/refs/tags
distname jdk-${version}+${build}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 16ac99fc5cfa368ec27613dfd90d56650026921f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57ed6b990b24b1e8b50099a265841add596d2c82e73c7c82bb530a8f53a47732 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 105413077
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 73a4bde8c6e02da4106e2d5c25cdf25e914022cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ccef9f46af500031330d308dc412d1cab415f2c9e0d06b742e709947158f3079 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 105494921
</span>
depends_lib port:freetype
depends_build port:openjdk18-bootstrap \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,6 @@ pre-patch {
</span> reinplace "s|xmacosx|xwindows|g" ${worksrcpath}/make/autoconf/lib-freetype.m4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set tpath /Library/Java
use_xcode yes
use_configure yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18/files/0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch b/java/openjdk18/files/0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d1ada3bcdd0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18/files/0001-8280476-macOS-hotspot-arm64-bug-exposed-by-latest-cl.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f5d6fddc6df8c5c5456a2544b131833d5227292b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Daniel D. Daugherty" <dcubed@openjdk.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 4 Feb 2022 17:37:01 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: kbarrett, adinn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/hotspot/cpu/aarch64/immediate_aarch64.cpp | 11 ++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 10 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/hotspot/cpu/aarch64/immediate_aarch64.cpp src/hotspot/cpu/aarch64/immediate_aarch64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3e38b7cca04..916494605bc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hotspot/cpu/aarch64/immediate_aarch64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hotspot/cpu/aarch64/immediate_aarch64.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,8 +129,17 @@ static inline uint32_t uimm(uint32_t val, int hi, int lo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t replicate(uint64_t bits, int nbits, int count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(count > 0, "must be");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(nbits > 0, "must be");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert(count * nbits <= 64, "must be");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Special case nbits == 64 since the shift below with that nbits value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // would result in undefined behavior.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (nbits == 64) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return bits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t result = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // nbits may be 64 in which case we want mask to be -1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t mask = ones(nbits);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < count ; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result <<= nbits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.35.1
</span></pre><pre style='margin:0'>
</pre>