openjdk25: add mcontext stuff for NetBSD/amd64

[Tobias Nygren (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Sep 6 17:09:48 2026 +0200
Changeset:	fd2f7df41e0cf7ade9f1cad70326bd54ca020e5b

Modified Files:
	openjdk25/distinfo
	openjdk25/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp

Log Message:
openjdk25: add mcontext stuff for NetBSD/amd64

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fd2f7df41e0cf7ade9f1cad70326bd54ca020e5b

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

diffstat:
 openjdk25/distinfo                                         |  2 +-
 .../patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs:
diff --git a/openjdk25/distinfo b/openjdk25/distinfo
index 85643c186d..451b6dd9d0 100644
--- a/openjdk25/distinfo
+++ b/openjdk25/distinfo
@@ -14,7 +14,7 @@ SHA1 (patch-make_common_JdkNativeCompilation.gmk) = 97256807fe59d690fe0aabdcc9d2
 SHA1 (patch-make_common_native_Link.gmk) = b453202c240959e42f1a1ba6dc84ce6c9f3a5dcc
 SHA1 (patch-src_hotspot_cpu_aarch64_macroAssembler__aarch64.cpp) = fa17af7a6dc4a91d6fe7abfc6060f0d102983928
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = 2bf688d0e569b5b53c9da4910fdfee19c2e26118
-SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = 543d5f4c39de0d17347651b0e592fc153f08caef
+SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = ff18408d20929bca1b96bcb9b603974c5b50ef82
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = ee7fd66ab5513a8d9027960e0b85341e69b3d698
 SHA1 (patch-src_hotspot_share_runtime_arguments.cpp) = f8a17090e8be99735553d696d4ef398a23a3a524
diff --git a/openjdk25/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp b/openjdk25/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
index d74a354b79..ff68d6cc48 100644
--- a/openjdk25/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
+++ b/openjdk25/patches/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp
@@ -2,41 +2,47 @@ $NetBSD$
 
 Fix zero build on NetBSD.
 
---- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig	2026-09-05 20:54:45.904702461 +0000
+--- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig	2026-07-24 17:22:09.000000000 +0000
 +++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
-@@ -91,7 +91,11 @@ address os::Posix::ucontext_get_pc(const ucontext_t* u
+@@ -91,7 +91,13 @@ address os::Posix::ucontext_get_pc(const ucontext_t* u
  
  address os::Posix::ucontext_get_pc(const ucontext_t* uc) {
    if (DecodeErrorContext) {
 -#if defined(IA32)
 +#if defined(__NetBSD__) && defined(IA32)
 +    return (address)uc->uc_mcontext.__gregs[_REG_EIP];
++#elif defined(__NetBSD__) && defined(AMD64)
++    return (address)uc->uc_mcontext.__gregs[_REG_RIP];
 +#elif defined(__NetBSD__) && defined(AARCH64)
 +    return (address)uc->uc_mcontext.__gregs[_REG_ELR];
 +#elif defined(IA32)
      return (address)uc->uc_mcontext.mc_eip;
  #elif defined(AMD64)
      return (address)uc->uc_mcontext.mc_rip;
-@@ -116,7 +120,11 @@ intptr_t* os::Bsd::ucontext_get_sp(const ucontext_t* u
+@@ -116,7 +122,13 @@ intptr_t* os::Bsd::ucontext_get_sp(const ucontext_t* u
  
  intptr_t* os::Bsd::ucontext_get_sp(const ucontext_t* uc) {
    if (DecodeErrorContext) {
 -#if defined(IA32)
 +#if defined(__NetBSD__) && defined(IA32)
 +    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_ESP];
++#elif defined(__NetBSD__) && defined(AMD64)
++    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_RSP];
 +#elif defined(__NetBSD__) && defined(AARCH64)
 +    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_SP];
 +#elif defined(IA32)
      return (intptr_t*)uc->uc_mcontext.mc_esp;
  #elif defined(AMD64)
      return (intptr_t*)uc->uc_mcontext.mc_rsp;
-@@ -137,7 +145,11 @@ intptr_t* os::Bsd::ucontext_get_fp(const ucontext_t* u
+@@ -137,7 +149,13 @@ intptr_t* os::Bsd::ucontext_get_fp(const ucontext_t* u
  
  intptr_t* os::Bsd::ucontext_get_fp(const ucontext_t* uc) {
    if (DecodeErrorContext) {
 -#if defined(IA32)
 +#if defined(__NetBSD__) && defined(IA32)
 +    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_EBP];
++#elif defined(__NetBSD__) && defined(AMD64)
++    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_RBP];
 +#elif defined(__NetBSD__) && defined(AARCH64)
 +    return (intptr_t*)uc->uc_mcontext.__gregs[_REG_FP];
 +#elif defined(IA32)