@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.633

package/libc/include/x86-netbsd-none/machine/mcontext.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.15 2019/12/27 00:32:17 kamil Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.19 2024/11/30 01:04:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,10 +36,10 @@
 /*
  * mcontext extensions to handle signal delivery.
  */
-#define _UC_SETSTACK	0x00010000
-#define _UC_CLRSTACK	0x00020000
-#define _UC_VM		0x00040000
-#define	_UC_TLSBASE	0x00080000
+#define	_UC_SETSTACK	_UC_MD_BIT16
+#define	_UC_CLRSTACK	_UC_MD_BIT17
+#define	_UC_VM		_UC_MD_BIT18
+#define	_UC_TLSBASE	_UC_MD_BIT19
 
 /*
  * Layout of mcontext_t according to the System V Application Binary Interface,
@@ -96,7 +96,7 @@ typedef struct {
 	__greg_t	_mc_tlsbase;
 } mcontext_t;
 
-#define _UC_FXSAVE	0x20	/* FP state is in FXSAVE format in XMM space */
+#define _UC_FXSAVE	_UC_MD_BIT5	/* FP state is in FXSAVE format in XMM space */
 
 #define _UC_MACHINE_PAD	4	/* Padding appended to ucontext_t */
 
@@ -113,22 +113,4 @@ typedef struct {
 
 #define	__UCONTEXT_SIZE	776
 
-#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
-    defined(__LIBPTHREAD_SOURCE__)
-#include <sys/tls.h>
-
-__BEGIN_DECLS
-static __inline void *
-__lwp_getprivate_fast(void)
-{
-	void *__tmp;
-
-	__asm volatile("movl %%gs:0, %0" : "=r" (__tmp));
-
-	return __tmp;
-}
-__END_DECLS
-
-#endif
-
 #endif	/* !_I386_MCONTEXT_H_ */

package/libc/include/x86-netbsd-none/machine/param.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.88 2021/05/31 14:38:55 simonb Exp $	*/
+/*	$NetBSD: param.h,v 1.89 2025/04/20 22:33:13 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -65,6 +65,14 @@
 #define ALIGNED_POINTER(p,t)		1
 #define ALIGNED_POINTER_LOAD(q,p,t)	memcpy((q), (p), sizeof(t))
 
+/*
+ * Stack alignment is 4-byte, following the traditional i386 SysV ABI
+ * published by SCO.  Note: Parts of the Linux world have altered the
+ * ABI to guarantee 16-byte alignment, which is convenient for SSE2,
+ * but an incompatible ABI change which we do not follow.
+ */
+#define	STACK_ALIGNBYTES	(4 - 1)
+
 #define	PGSHIFT		12		/* LOG2(NBPG) */
 #define	NBPG		(1 << PGSHIFT)	/* bytes/page */
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */

package/libc/include/x86-netbsd-none/machine/pcb.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: pcb.h,v 1.59 2019/10/12 06:31:03 maxv Exp $	*/
+/*	$NetBSD: pcb.h,v 1.61 2025/04/24 09:29:09 kre Exp $	*/
 
 /*
  * Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -99,12 +99,16 @@ struct pcb {
 	int	not_used[15];
 
 	/* floating point state */
-	union savefpu	pcb_savefpu __aligned(64);
+	union savefpu	pcb_savefpu[1] __aligned(64);
+#define	pcb_savefpusmall	pcb_savefpu
 	/* **** DO NOT ADD ANYTHING HERE **** */
 
 };
 #ifndef __lint__
+#include <sys/stddef.h>		/* for offsetof() */
+
 /* This doesn't really matter, but there is a lot of implied padding */
+__CTASSERT(offsetof(struct pcb, pcb_savefpu) == 128);
 __CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) == 128);
 #endif
 

package/libc/include/x86-netbsd-none/machine/ptrace.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.26 2020/05/30 08:41:23 maxv Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.27 2023/11/20 03:05:48 simonb Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -162,7 +162,7 @@
 #define PT32_GETXSTATE		PT_GETXSTATE
 #define COREDUMP_MACHDEP_LWP_NOTES(l, ns, name)				\
 {									\
-	struct xstate xstate;						\
+	struct xstate xstate;	/* XXX FIXME big stack object */	\
 	memset(&xstate, 0, sizeof(xstate));				\
 	if (!process_read_xstate(l, &xstate))				\
 	{								\

package/libc/include/x86-netbsd-none/machine/types.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.93 2021/04/01 04:35:46 simonb Exp $	*/
+/*	$NetBSD: types.h,v 1.95 2025/05/08 05:31:16 imil Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -134,5 +134,6 @@ typedef __register_t	register_t;
 #define	__HAVE_COMMON___TLS_GET_ADDR
 #define	__HAVE_UCAS_FULL
 #define	__HAVE_RAS
+#define	__HAVE_BOOT_DURATION
 
 #endif	/* _I386_MACHTYPES_H_ */

package/libc/include/x86_64-netbsd-none/amd64/asm.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.22 2021/04/17 20:12:55 rillig Exp $	*/
+/*	$NetBSD: asm.h,v 1.24 2025/01/05 14:30:37 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -112,9 +112,17 @@
 
 #define	ASMSTR		.asciz
 
-#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
-			.asciz x;					\
+#define _IDENTSTR(x)	.pushsection ".ident","MS",@progbits,1;		\
+			x;						\
 			.popsection
+#ifdef _NETBSD_REVISIONID
+#define	RCSID(_s)							      \
+	_IDENTSTR(.asciz _s);						      \
+	_IDENTSTR(.ascii "$"; .ascii "NetBSD: "; .ascii __FILE__; .ascii " "; \
+	    .ascii _NETBSD_REVISIONID; .asciz " $")
+#else
+#define	RCSID(_s)	_IDENTSTR(.asciz _s)
+#endif
 
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\

package/libc/include/x86_64-netbsd-none/amd64/byte_swap.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.8 2021/04/17 20:12:55 rillig Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.8.24.1 2025/12/18 19:57:52 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #ifdef __x86_64__
 
 #ifdef  __GNUC__
-#include <sys/types.h>
+#include <sys/stdint.h>
 __BEGIN_DECLS
 
 #define	__BYTE_SWAP_U64_VARIABLE __byte_swap_u64_variable

package/libc/include/x86_64-netbsd-none/amd64/cpu.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.70 2021/11/02 11:26:03 ryo Exp $	*/
+/*	$NetBSD: cpu.h,v 1.72 2023/09/04 20:58:52 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -48,12 +48,20 @@
 static struct cpu_info *x86_curcpu(void);
 static lwp_t *x86_curlwp(void);
 
+/*
+ * XXXGCC12 has:
+ * ./machine/cpu.h:57:9: error: array subscript 0 is outside array bounds of 'struct cpu_info * const[0]' [-Werror=array-bounds]
+ *    56 |         __asm("movq %%gs:%1, %0" :
+ */
+#pragma GCC push_options
+#pragma GCC diagnostic ignored "-Warray-bounds"
+
 __inline __always_inline static struct cpu_info * __unused __nomsan
 x86_curcpu(void)
 {
 	struct cpu_info *ci;
 
-	__asm volatile("movq %%gs:%1, %0" :
+	__asm("movq %%gs:%1, %0" :
 	    "=r" (ci) :
 	    "m"
 	    (*(struct cpu_info * const *)offsetof(struct cpu_info, ci_self)));
@@ -65,13 +73,15 @@ x86_curlwp(void)
 {
 	lwp_t *l;
 
-	__asm volatile("movq %%gs:%1, %0" :
+	__asm("movq %%gs:%1, %0" :
 	    "=r" (l) :
 	    "m"
 	    (*(struct cpu_info * const *)offsetof(struct cpu_info, ci_curlwp)));
 	return l;
 }
 
+#pragma GCC pop_options
+
 #endif	/* __GNUC__ && !_MODULE */
 
 #ifdef XENPV

package/libc/include/x86_64-netbsd-none/amd64/frame.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: frame.h,v 1.22 2019/02/14 08:18:25 cherry Exp $	*/
+/*	$NetBSD: frame.h,v 1.23 2025/06/27 21:36:24 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ struct intrframe {
 
 #ifdef XEN
 /*
- * Need arch independany way to access IP and CS from intrframe
+ * Need arch independent way to access IP and CS from intrframe
  */
 #define	_INTRFRAME_CS	if_tf.tf_cs
 #define	_INTRFRAME_IP	if_tf.tf_rip

package/libc/include/x86_64-netbsd-none/amd64/lwp_private.h

@@ -0,0 +1,3 @@
+/*	$NetBSD: lwp_private.h,v 1.1 2024/11/30 01:04:06 christos Exp $	*/
+
+#include <x86/lwp_private.h>

package/libc/include/x86_64-netbsd-none/amd64/mcontext.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.20 2019/12/27 00:32:16 kamil Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.24 2024/11/30 01:04:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -74,34 +74,16 @@ typedef struct {
 
 #define	_UC_MACHINE_SET_PC(uc, pc)	_UC_MACHINE_PC(uc) = (pc)
 
-#define	_UC_TLSBASE	0x00080000
+#define	_UC_TLSBASE	_UC_MD_BIT19
 
 /*
  * mcontext extensions to handle signal delivery.
  */
-#define _UC_SETSTACK	0x00010000
-#define _UC_CLRSTACK	0x00020000
+#define _UC_SETSTACK	_UC_MD_BIT16
+#define _UC_CLRSTACK	_UC_MD_BIT17
 
 #define	__UCONTEXT_SIZE	784
 
-#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
-    defined(__LIBPTHREAD_SOURCE__)
-#include <sys/tls.h>
-
-__BEGIN_DECLS
-static __inline void *
-__lwp_getprivate_fast(void)
-{
-	void *__tmp;
-
-	__asm volatile("movq %%fs:0, %0" : "=r" (__tmp));
-
-	return __tmp;
-}
-__END_DECLS
-
-#endif
-
 #ifdef _KERNEL
 
 /*
@@ -155,7 +137,7 @@ typedef struct {
 	uint32_t	_mc_tlsbase;
 } mcontext32_t;
 
-#define _UC_FXSAVE       0x20    /* FP state is in FXSAVE format in XMM space */
+#define _UC_FXSAVE       _UC_MD_BIT5    /* FP state is in FXSAVE format in XMM space */
 
 #define	_UC_MACHINE32_PAD	4
 #define	__UCONTEXT32_SIZE	776

package/libc/include/x86_64-netbsd-none/amd64/param.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.38 2020/06/29 09:56:51 jdolecek Exp $	*/
+/*	$NetBSD: param.h,v 1.42 2025/04/27 01:32:09 riastradh Exp $	*/
 
 #ifdef __x86_64__
 
@@ -31,6 +31,7 @@
  * (2) rtld in glibc >= 2.23 for Linux/x86_64 requires it.
  */
 #define STACK_ALIGNBYTES	(16 - 1)
+#define	STACK_ALIGNBYTES32	(4 - 1)
 
 #define ALIGNBYTES32		(sizeof(int) - 1)
 #define ALIGN32(p)		(((u_long)(p) + ALIGNBYTES32) &~ALIGNBYTES32)
@@ -69,12 +70,30 @@
 #define	SINCR		1		/* increment of stack/NBPG */
 
 #if defined(KASAN) || defined(KMSAN)
-#define	UPAGES		8
+#define UPAGES_KxSAN	3
+#else
+#define	UPAGES_KxSAN	0
+#endif
+#if defined(SVS)
+#define	UPAGES_SVS	1
+#else
+#define	UPAGES_SVS	0
+#endif
+#define	UPAGES_PCB	1	/* one page for the PCB */
+#define	UPAGES_RED	1	/* one page for red zone between pcb/stack */
+#define	UPAGES_STACK	3	/* three pages (12 KiB) of stack space */
+#define	UPAGES		\
+	(UPAGES_PCB + UPAGES_RED + UPAGES_STACK + UPAGES_SVS + UPAGES_KxSAN)
+
+#ifndef _STANDALONE
+#if defined(KASAN) || defined(KMSAN)
+__CTASSERT(UPAGES == 8);
 #elif defined(SVS)
-#define	UPAGES		6		/* 1 page used internally by SVS */
+__CTASSERT(UPAGES == 6);
 #else
-#define	UPAGES		5		/* pages of u-area (1 for redzone) */
+__CTASSERT(UPAGES == 5);
 #endif
+#endif	/* _STANDALONE */
 #define	USPACE		(UPAGES * NBPG)	/* total size of u-area */
 
 #ifndef MSGBUFSIZE

package/libc/include/x86_64-netbsd-none/amd64/pcb.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: pcb.h,v 1.32 2020/03/17 17:18:49 maxv Exp $	*/
+/*	$NetBSD: pcb.h,v 1.35 2025/04/28 13:01:27 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -97,13 +97,24 @@ struct pcb {
 	struct dbreg *pcb_dbregs;
 	uint16_t pcb_fpu_dflt_cw;
 	int pcb_iopl;
-
+#ifdef XENPV			/* XXX XENPV PR kern/59371 */
 	uint32_t pcb_unused[8];		/* unused */
+	union savefpu	pcb_savefpu[1] __aligned(64);
+#define	pcb_savefpusmall	pcb_savefpu
+#else
+	union savefpu *pcb_savefpu;
+
+	uint32_t pcb_unused[6];		/* unused */
 
-	union savefpu	pcb_savefpu __aligned(64); /* floating point state */
+	/* fpu state, if it fits; otherwise allocated separately */
+	union savefpu	pcb_savefpusmall __aligned(64);
+#endif
 	/* **** DO NOT ADD ANYTHING HERE **** */
 };
 #ifndef __lint__
+#include <sys/stddef.h>		/* for offsetof() */
+
+__CTASSERT(offsetof(struct pcb, pcb_savefpusmall) == 128);
 __CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) ==  128);
 #endif
 

package/libc/include/x86_64-netbsd-none/amd64/ptrace.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.22 2020/05/30 08:41:22 maxv Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.23 2023/11/20 03:05:48 simonb Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -117,7 +117,7 @@ MODULE_HOOK(netbsd32_process_doxmmregs_hook, int,
 #define PT64_GETXSTATE		PT_GETXSTATE
 #define COREDUMP_MACHDEP_LWP_NOTES(l, ns, name)				\
 {									\
-	struct xstate xstate;						\
+	struct xstate xstate;	/* XXX FIXME big stack object */	\
 	memset(&xstate, 0, sizeof(xstate));				\
 	if (!process_read_xstate(l, &xstate))				\
 	{								\

package/libc/include/x86_64-netbsd-none/amd64/types.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.71 2021/04/01 04:35:45 simonb Exp $	*/
+/*	$NetBSD: types.h,v 1.73 2025/05/08 05:31:16 imil Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -101,6 +101,7 @@ typedef	unsigned char		__cpu_simple_lock_nv_t;
 #define	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 #define	__HAVE_UCAS_FULL
 #define	__HAVE_BUS_SPACE_8
+#define	__HAVE_BOOT_DURATION
 
 #ifdef _KERNEL_OPT
 #define	__HAVE_RAS

package/libc/include/x86_64-netbsd-none/machine/asm.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.22 2021/04/17 20:12:55 rillig Exp $	*/
+/*	$NetBSD: asm.h,v 1.24 2025/01/05 14:30:37 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -112,9 +112,17 @@
 
 #define	ASMSTR		.asciz
 
-#define RCSID(x)	.pushsection ".ident","MS",@progbits,1;		\
-			.asciz x;					\
+#define _IDENTSTR(x)	.pushsection ".ident","MS",@progbits,1;		\
+			x;						\
 			.popsection
+#ifdef _NETBSD_REVISIONID
+#define	RCSID(_s)							      \
+	_IDENTSTR(.asciz _s);						      \
+	_IDENTSTR(.ascii "$"; .ascii "NetBSD: "; .ascii __FILE__; .ascii " "; \
+	    .ascii _NETBSD_REVISIONID; .asciz " $")
+#else
+#define	RCSID(_s)	_IDENTSTR(.asciz _s)
+#endif
 
 #define	WEAK_ALIAS(alias,sym)						\
 	.weak alias;							\

package/libc/include/x86_64-netbsd-none/machine/byte_swap.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.8 2021/04/17 20:12:55 rillig Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.8.24.1 2025/12/18 19:57:52 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #ifdef __x86_64__
 
 #ifdef  __GNUC__
-#include <sys/types.h>
+#include <sys/stdint.h>
 __BEGIN_DECLS
 
 #define	__BYTE_SWAP_U64_VARIABLE __byte_swap_u64_variable

package/libc/include/x86_64-netbsd-none/machine/cpu.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.70 2021/11/02 11:26:03 ryo Exp $	*/
+/*	$NetBSD: cpu.h,v 1.72 2023/09/04 20:58:52 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -48,12 +48,20 @@
 static struct cpu_info *x86_curcpu(void);
 static lwp_t *x86_curlwp(void);
 
+/*
+ * XXXGCC12 has:
+ * ./machine/cpu.h:57:9: error: array subscript 0 is outside array bounds of 'struct cpu_info * const[0]' [-Werror=array-bounds]
+ *    56 |         __asm("movq %%gs:%1, %0" :
+ */
+#pragma GCC push_options
+#pragma GCC diagnostic ignored "-Warray-bounds"
+
 __inline __always_inline static struct cpu_info * __unused __nomsan
 x86_curcpu(void)
 {
 	struct cpu_info *ci;
 
-	__asm volatile("movq %%gs:%1, %0" :
+	__asm("movq %%gs:%1, %0" :
 	    "=r" (ci) :
 	    "m"
 	    (*(struct cpu_info * const *)offsetof(struct cpu_info, ci_self)));
@@ -65,13 +73,15 @@ x86_curlwp(void)
 {
 	lwp_t *l;
 
-	__asm volatile("movq %%gs:%1, %0" :
+	__asm("movq %%gs:%1, %0" :
 	    "=r" (l) :
 	    "m"
 	    (*(struct cpu_info * const *)offsetof(struct cpu_info, ci_curlwp)));
 	return l;
 }
 
+#pragma GCC pop_options
+
 #endif	/* __GNUC__ && !_MODULE */
 
 #ifdef XENPV

package/libc/include/x86_64-netbsd-none/machine/frame.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: frame.h,v 1.22 2019/02/14 08:18:25 cherry Exp $	*/
+/*	$NetBSD: frame.h,v 1.23 2025/06/27 21:36:24 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ struct intrframe {
 
 #ifdef XEN
 /*
- * Need arch independany way to access IP and CS from intrframe
+ * Need arch independent way to access IP and CS from intrframe
  */
 #define	_INTRFRAME_CS	if_tf.tf_cs
 #define	_INTRFRAME_IP	if_tf.tf_rip

package/libc/include/x86_64-netbsd-none/machine/lwp_private.h

@@ -0,0 +1,3 @@
+/*	$NetBSD: lwp_private.h,v 1.1 2024/11/30 01:04:06 christos Exp $	*/
+
+#include <x86/lwp_private.h>

package/libc/include/x86_64-netbsd-none/machine/mcontext.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.20 2019/12/27 00:32:16 kamil Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.24 2024/11/30 01:04:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -74,34 +74,16 @@ typedef struct {
 
 #define	_UC_MACHINE_SET_PC(uc, pc)	_UC_MACHINE_PC(uc) = (pc)
 
-#define	_UC_TLSBASE	0x00080000
+#define	_UC_TLSBASE	_UC_MD_BIT19
 
 /*
  * mcontext extensions to handle signal delivery.
  */
-#define _UC_SETSTACK	0x00010000
-#define _UC_CLRSTACK	0x00020000
+#define _UC_SETSTACK	_UC_MD_BIT16
+#define _UC_CLRSTACK	_UC_MD_BIT17
 
 #define	__UCONTEXT_SIZE	784
 
-#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
-    defined(__LIBPTHREAD_SOURCE__)
-#include <sys/tls.h>
-
-__BEGIN_DECLS
-static __inline void *
-__lwp_getprivate_fast(void)
-{
-	void *__tmp;
-
-	__asm volatile("movq %%fs:0, %0" : "=r" (__tmp));
-
-	return __tmp;
-}
-__END_DECLS
-
-#endif
-
 #ifdef _KERNEL
 
 /*
@@ -155,7 +137,7 @@ typedef struct {
 	uint32_t	_mc_tlsbase;
 } mcontext32_t;
 
-#define _UC_FXSAVE       0x20    /* FP state is in FXSAVE format in XMM space */
+#define _UC_FXSAVE       _UC_MD_BIT5    /* FP state is in FXSAVE format in XMM space */
 
 #define	_UC_MACHINE32_PAD	4
 #define	__UCONTEXT32_SIZE	776

package/libc/include/x86_64-netbsd-none/machine/param.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.38 2020/06/29 09:56:51 jdolecek Exp $	*/
+/*	$NetBSD: param.h,v 1.42 2025/04/27 01:32:09 riastradh Exp $	*/
 
 #ifdef __x86_64__
 
@@ -31,6 +31,7 @@
  * (2) rtld in glibc >= 2.23 for Linux/x86_64 requires it.
  */
 #define STACK_ALIGNBYTES	(16 - 1)
+#define	STACK_ALIGNBYTES32	(4 - 1)
 
 #define ALIGNBYTES32		(sizeof(int) - 1)
 #define ALIGN32(p)		(((u_long)(p) + ALIGNBYTES32) &~ALIGNBYTES32)
@@ -69,12 +70,30 @@
 #define	SINCR		1		/* increment of stack/NBPG */
 
 #if defined(KASAN) || defined(KMSAN)
-#define	UPAGES		8
+#define UPAGES_KxSAN	3
+#else
+#define	UPAGES_KxSAN	0
+#endif
+#if defined(SVS)
+#define	UPAGES_SVS	1
+#else
+#define	UPAGES_SVS	0
+#endif
+#define	UPAGES_PCB	1	/* one page for the PCB */
+#define	UPAGES_RED	1	/* one page for red zone between pcb/stack */
+#define	UPAGES_STACK	3	/* three pages (12 KiB) of stack space */
+#define	UPAGES		\
+	(UPAGES_PCB + UPAGES_RED + UPAGES_STACK + UPAGES_SVS + UPAGES_KxSAN)
+
+#ifndef _STANDALONE
+#if defined(KASAN) || defined(KMSAN)
+__CTASSERT(UPAGES == 8);
 #elif defined(SVS)
-#define	UPAGES		6		/* 1 page used internally by SVS */
+__CTASSERT(UPAGES == 6);
 #else
-#define	UPAGES		5		/* pages of u-area (1 for redzone) */
+__CTASSERT(UPAGES == 5);
 #endif
+#endif	/* _STANDALONE */
 #define	USPACE		(UPAGES * NBPG)	/* total size of u-area */
 
 #ifndef MSGBUFSIZE

package/libc/include/x86_64-netbsd-none/machine/pcb.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: pcb.h,v 1.32 2020/03/17 17:18:49 maxv Exp $	*/
+/*	$NetBSD: pcb.h,v 1.35 2025/04/28 13:01:27 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -97,13 +97,24 @@ struct pcb {
 	struct dbreg *pcb_dbregs;
 	uint16_t pcb_fpu_dflt_cw;
 	int pcb_iopl;
-
+#ifdef XENPV			/* XXX XENPV PR kern/59371 */
 	uint32_t pcb_unused[8];		/* unused */
+	union savefpu	pcb_savefpu[1] __aligned(64);
+#define	pcb_savefpusmall	pcb_savefpu
+#else
+	union savefpu *pcb_savefpu;
+
+	uint32_t pcb_unused[6];		/* unused */
 
-	union savefpu	pcb_savefpu __aligned(64); /* floating point state */
+	/* fpu state, if it fits; otherwise allocated separately */
+	union savefpu	pcb_savefpusmall __aligned(64);
+#endif
 	/* **** DO NOT ADD ANYTHING HERE **** */
 };
 #ifndef __lint__
+#include <sys/stddef.h>		/* for offsetof() */
+
+__CTASSERT(offsetof(struct pcb, pcb_savefpusmall) == 128);
 __CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) ==  128);
 #endif
 

package/libc/include/x86_64-netbsd-none/machine/ptrace.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.22 2020/05/30 08:41:22 maxv Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.23 2023/11/20 03:05:48 simonb Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -117,7 +117,7 @@ MODULE_HOOK(netbsd32_process_doxmmregs_hook, int,
 #define PT64_GETXSTATE		PT_GETXSTATE
 #define COREDUMP_MACHDEP_LWP_NOTES(l, ns, name)				\
 {									\
-	struct xstate xstate;						\
+	struct xstate xstate;	/* XXX FIXME big stack object */	\
 	memset(&xstate, 0, sizeof(xstate));				\
 	if (!process_read_xstate(l, &xstate))				\
 	{								\