CVS commit: pkgsrc/lang/openjdk21

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep  5 20:50:27 UTC 2026

Modified Files:
        pkgsrc/lang/openjdk21: distinfo
        pkgsrc/lang/openjdk21/patches:
            patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp

Log Message:
openjdk21: build fix for netbsd-9 aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/openjdk21/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk21/distinfo
diff -u pkgsrc/lang/openjdk21/distinfo:1.18 pkgsrc/lang/openjdk21/distinfo:1.19
--- pkgsrc/lang/openjdk21/distinfo:1.18 Sat Sep  5 09:44:05 2026
+++ pkgsrc/lang/openjdk21/distinfo      Sat Sep  5 20:50:27 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2026/09/05 09:44:05 tnn Exp $
+$NetBSD: distinfo,v 1.19 2026/09/05 20:50:27 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 017a9d787a34faa997d72ac69bcafd9c8ab72354e3a1b751d1cb5d376b364f72
 SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 7ec4208363f44a378674a2b87687ab7facb60bf73118ebd4bec35f7912f073365b36efc4c4b3c034bc448139cb81106e18d6d3b1db45f4ab086ce1ed72bc21bf
@@ -20,7 +20,7 @@ SHA1 (patch-make_autoconf_lib-bundled.m4
 SHA1 (patch-make_autoconf_lib-freetype.m4) = bd791b99e4fd87f24432831fba1e814dd199445f
 SHA1 (patch-make_autoconf_lib-x11.m4) = 38038e6d7cfc2d15fb3537a52f11d2961cc2ec99
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = d69fa8c5cab173be2f41cfbd6479dad60a6337db
-SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = 3e0597bf836b23ae1a808834a0c1a9874ae47915
+SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = c4db01034655302ca686b3ca2a95ab0ade72ce3a
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
 SHA1 (patch-src_hotspot_share_runtime_threadWXSetters.inline.hpp) = f704bb060803e500415b5d300e26857cf7288ca5
 SHA1 (patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties) = 01aff1bb2c14265b0ebcc9d12fba8d48b876d36e

Index: pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp
diff -u pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp:1.1 
pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp:1.2
--- pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp:1.1      Sun Aug 16 11:54:29 2026
+++ pkgsrc/lang/openjdk21/patches/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp  Sat Sep  5 20:50:27 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp,v 1.1 2026/08/16 11:54:29 tnn Exp $
+$NetBSD: patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp,v 1.2 2026/09/05 20:50:27 tnn Exp $
 
 Add runtime CPU detection support for NetBSD.
 
---- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp.orig     2026-08-16 10:56:39.893223726 +0000
+--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp.orig     2026-07-23 23:33:34.000000000 +0000
 +++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp
 @@ -27,6 +27,13 @@
  #include "precompiled.hpp"
@@ -18,7 +18,7 @@ Add runtime CPU detection support for Ne
  
  void VM_Version::get_compatible_board(char *buf, int buflen) {
    assert(buf != nullptr, "invalid argument");
-@@ -541,6 +548,98 @@ void VM_Version::get_os_cpu_info() {
+@@ -541,6 +548,110 @@ void VM_Version::get_os_cpu_info() {
    }
  #endif // __FreeBSD__
  #endif // __FreeBSD__ || __OpenBSD__
@@ -66,19 +66,31 @@ Add runtime CPU detection support for Ne
 +      num_sha2++;
 +    if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_CRC32) >= ID_AA64ISAR0_EL1_CRC32_CRC32X)
 +      num_crc32++;
++#if defined(ID_AA64ISAR0_EL1_ATOMIC_SWP)
 +    if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_ATOMIC) >= ID_AA64ISAR0_EL1_ATOMIC_SWP)
 +      num_lse++;
++#endif
++#if defined(ID_AA64ISAR1_EL1_DPB_CVAP)
 +    if (__SHIFTOUT(id.ac_aa64isar1, ID_AA64ISAR1_EL1_DPB) >= ID_AA64ISAR1_EL1_DPB_CVAP)
 +      num_dcpop++;
++#endif
++#if defined(ID_AA64ISAR0_EL1_SHA3_EOR3)
 +    if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_SHA3) >= ID_AA64ISAR0_EL1_SHA3_EOR3)
 +      num_sha3++;
++#endif
++#if defined(ID_AA64ISAR0_EL1_SHA2_SHA512HSU)
 +    if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_SHA2) >= ID_AA64ISAR0_EL1_SHA2_SHA512HSU)
 +      num_sha512++;
++#endif
++#if defined(ID_AA64PFR0_EL1_SVE_IMPL)
 +    if (__SHIFTOUT(id.ac_aa64pfr0,  ID_AA64PFR0_EL1_SVE) >= ID_AA64PFR0_EL1_SVE_IMPL)
 +      num_sve++;
++#endif
++#if defined(ID_AA64ISAR1_EL1_APA_QARMA) && defined(ID_AA64ISAR1_EL1_API_SUPPORTED)
 +    if (__SHIFTOUT(id.ac_aa64isar1, ID_AA64ISAR1_EL1_APA) >= ID_AA64ISAR1_EL1_APA_QARMA ||
 +        __SHIFTOUT(id.ac_aa64isar1, ID_AA64ISAR1_EL1_API) >= ID_AA64ISAR1_EL1_API_SUPPORTED)
 +     num_paca++;
++#endif
 +    // TODO: SVE2 and SVE_BITPERM live in id.ac_aa64zfr0 but shiftout macros are not yet added to armreg.h
 +  }
 +  _features = 0;