head	1.1;
access;
symbols
	pkgsrc-2026Q3:1.1.0.2
	pkgsrc-2026Q3-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2026.09.06.16.53.12;	author tnn;	state Exp;
branches;
next	;
commitid	7IRC8SbgwTaeaAUG;


desc
@@


1.1
log
@openjdk{17,21}: backport Zero VM build fixes from wip/openjdk25
@
text
@$NetBSD$

Fix zero build on NetBSD.

--- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig	2026-07-23 23:33:34.000000000 +0000
+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
@@@@ -93,7 +93,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;
@@@@ -118,7 +124,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;
@@@@ -139,7 +151,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)
     return (intptr_t*)uc->uc_mcontext.mc_ebp;
 #elif defined(AMD64)
     return (intptr_t*)uc->uc_mcontext.mc_rbp;
@