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

package/libc/include/arm-netbsd-eabi/machine/asm.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.34 2020/04/23 23:22:41 jakllsch Exp $	*/
+/*	$NetBSD: asm.h,v 1.39.2.1 2026/04/02 19:12:03 martin Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -73,8 +73,10 @@
 
 #ifdef __thumb__
 #define THUMB_INSN(n)	n
+#define _INSN_SIZE	(2)
 #else
 #define THUMB_INSN(n)
+#define _INSN_SIZE	(4)
 #endif
 
 #define	__BIT(n)	(1 << (n))
@@ -130,7 +132,7 @@
 
 #ifdef GPROF
 # define _PROF_PROLOGUE	\
-	mov ip, lr; bl __mcount
+	push {lr}; bl __gnu_mcount_nc
 #else
 # define _PROF_PROLOGUE
 #endif
@@ -194,21 +196,25 @@
 #define	GOT_GET(x,got,sym)	\
 	ldr	x, sym;		\
 	ldr	x, [x, got]
-#define	GOT_INIT(got,gotsym,pclabel) \
-	ldr	got, gotsym;	\
-	pclabel: add	got, got, pc
-#ifdef __thumb__
-#define	GOT_INITSYM(gotsym,pclabel) \
-	.align 0;		\
-	gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+4)
-#else
-#define	GOT_INITSYM(gotsym,pclabel) \
+
+/*
+ * Load _GLOBAL_OFFSET_TABLE_ address into register:
+ *
+ * 0:	GOT_INIT(rX, .Lgot)
+ *	...
+ *
+ *      // and in the data after the function
+ *	GOT_INITSYM(.Lgot, 0b)
+ */
+#define	GOT_INIT(Rgot, gotsym)	  \
+	ldr	Rgot, gotsym	; \
+	add	Rgot, Rgot, pc
+#define	GOT_INITSYM(gotsym, initlabel)	\
 	.align 0;		\
-	gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+8)
-#endif
+	gotsym:	.word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (initlabel+(1+2)*_INSN_SIZE)
 
 #ifdef __STDC__
-#define	PIC_SYM(x,y)	x ## ( ## y ## )
+#define	PIC_SYM(x,y)	x(y)
 #else
 #define	PIC_SYM(x,y)	x/**/(/**/y/**/)
 #endif
@@ -219,15 +225,38 @@
 #define	GOT_SYM(x)	x
 #define	GOT_GET(x,got,sym)	\
 	ldr	x, sym;
-#define	GOT_INIT(got,gotsym,pclabel)
-#define	GOT_INITSYM(gotsym,pclabel)
+#define	GOT_INIT(Rgot, gotsym)
+#define	GOT_INITSYM(gotsym, initlabel)
 #define	PIC_SYM(x,y)	x
 #endif	/* __PIC__ */
 
-#define RCSID(x)	.pushsection ".ident","MS",%progbits,1;		\
-			.asciz x;					\
+/*
+ * Annoyingly, gas on arm seems to generate _two_ NUL-terminated
+ * strings for
+ *
+ *	.asciz "foo" "bar"
+ *
+ * instead of concatenating it into a single NUL-terminated string as
+ * on other architectures.
+ *
+ * To work around this, we concatenate into a single NUL-terminated by:
+ *
+ *	.ascii "foo"
+ *	.asciz "bar"
+ */
+#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;							\
 	alias = sym
@@ -241,7 +270,7 @@
 
 #ifdef __STDC__
 #define	WARN_REFERENCES(sym,msg)					\
-	.pushsection .gnu.warning. ## sym;				\
+	.pushsection .gnu.warning.sym;					\
 	.ascii msg;							\
 	.popsection
 #else

package/libc/include/arm-netbsd-eabi/machine/byte_swap.h

@@ -0,0 +1,121 @@
+/*	$NetBSD: byte_swap.h,v 1.16.52.1 2025/12/18 19:57:52 martin Exp $	*/
+
+/*-
+ * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum, Neil A. Carson, and Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_BYTE_SWAP_H_
+#define	_ARM_BYTE_SWAP_H_
+
+#ifdef _LOCORE
+
+#if defined(_ARM_ARCH_6) || defined(_ARM_ARCH_7)
+
+#define	BSWAP16(_src, _dst, _tmp)		\
+	rev16	_dst, _src
+#define	BSWAP32(_src, _dst, _tmp)		\
+	rev	_dst, _src
+
+#else
+
+#define	BSWAP16(_src, _dst, _tmp)		\
+	mov	_tmp, _src, ror #8		;\
+	orr	_tmp, _tmp, _tmp, lsr #16	;\
+	bic	_dst, _tmp, _tmp, lsl #16
+
+#define	BSWAP32(_src, _dst, _tmp)		\
+	eor	_tmp, _src, _src, ror #16	;\
+	bic	_tmp, _tmp, #0x00FF0000		;\
+	mov	_dst, _src, ror #8		;\
+	eor	_dst, _dst, _tmp, lsr #8
+
+#endif
+
+
+#else
+
+#ifdef __GNUC__
+#include <sys/stdint.h>
+__BEGIN_DECLS
+
+#define	__BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
+static __inline uint32_t
+__byte_swap_u32_variable(uint32_t v)
+{
+	uint32_t t1;
+
+#ifdef _ARM_ARCH_6
+	if (!__builtin_constant_p(v)) {
+		__asm("rev\t%0, %1" : "=r" (v) : "0" (v));
+		return v;
+	}
+#endif
+
+	t1 = v ^ ((v << 16) | (v >> 16));
+	t1 &= 0xff00ffffU;
+	v = (v >> 8) | (v << 24);
+	v ^= (t1 >> 8);
+
+	return v;
+}
+
+#define	__BYTE_SWAP_U16_VARIABLE __byte_swap_u16_variable
+static __inline uint16_t
+__byte_swap_u16_variable(uint16_t v)
+{
+
+#ifdef _ARM_ARCH_6
+	if (!__builtin_constant_p(v)) {
+		uint32_t v32 = v;
+		__asm("rev16\t%0, %1" : "=r" (v32) : "0" (v32));
+		return (uint16_t)v32;
+	}
+#elif !defined(__thumb__) && 0	/* gcc produces decent code for this */
+	if (!__builtin_constant_p(v)) {
+		uint32_t v0 = v;
+		__asm volatile(
+			"mov	%0, %1, ror #8\n"
+			"orr	%0, %0, %0, lsr #16\n"
+			"bic	%0, %0, %0, lsl #16"
+		: "=&r" (v0)
+		: "0" (v0));
+		return (uint16_t)v0;
+	}
+#endif
+	v &= 0xffff;
+	v = (uint16_t)((v >> 8) | (v << 8));
+
+	return v;
+}
+
+__END_DECLS
+#endif
+
+#endif	/* _LOCORE */
+
+#endif /* _ARM_BYTE_SWAP_H_ */

package/libc/include/arm-netbsd-eabi/machine/cpu.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.123.4.1 2023/08/09 17:42:01 martin Exp $	*/
+/*	$NetBSD: cpu.h,v 1.125 2023/07/11 11:01:18 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -236,8 +236,6 @@ struct cpu_info {
 	uint32_t	ci_vfp_id;
 	uint64_t	ci_lastintr;
 
-	struct pmap_tlb_info *
-			ci_tlb_info;
 	struct pmap *	ci_pmap_lastuser;
 	struct pmap *	ci_pmap_cur;
 	tlb_asid_t	ci_pmap_asid_cur;

package/libc/include/arm-netbsd-eabi/machine/float.h

@@ -1,4 +1,4 @@
-/* $NetBSD: float.h,v 1.8 2014/01/29 01:10:36 matt Exp $ */
+/* $NetBSD: float.h,v 1.9 2024/10/30 15:56:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
 #define _ARM_FLOAT_H_
 
 #include <sys/cdefs.h>
+#include <sys/featuretest.h>
 
 #ifdef __ARM_PCS_AAPCS64
 

package/libc/include/arm-netbsd-eabi/machine/lwp_private.h

@@ -0,0 +1,81 @@
+/*	$NetBSD: lwp_private.h,v 1.1 2024/11/30 01:04:07 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Klaus Klein and by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_LWP_PRIVATE_H_
+#define _ARM_LWP_PRIVATE_H_
+
+#include <sys/cdefs.h>
+#include <sys/tls.h>
+
+#include <lwp.h>
+
+#if defined(__aarch64__)
+
+__BEGIN_DECLS
+static __inline void *
+__lwp_getprivate_fast(void)
+{
+	void *__tpidr;
+	__asm __volatile("mrs\t%0, tpidr_el0" : "=r"(__tpidr));
+	return __tpidr;
+}
+__END_DECLS
+
+#elif defined(__arm__)
+
+#if defined(__thumb__) && !defined(_ARM_ARCH_T2)
+#include <arm/eabi.h>
+#endif
+
+__BEGIN_DECLS
+static __inline void *
+__lwp_getprivate_fast(void)
+{
+#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
+	void *rv;
+	__asm("mrc p15, 0, %0, c13, c0, 3" : "=r"(rv));
+	if (__predict_true(rv))
+		return rv;
+	/*
+	 * Some ARM cores are broken and don't raise an undefined fault when an
+	 * unrecogized mrc instruction is encountered, but just return zero.
+	 * To do deal with that, if we get a zero we (re-)fetch the value using
+	 * syscall.
+	 */
+	return _lwp_getprivate();
+#else
+	return __aeabi_read_tp();
+#endif /* !__thumb__ || _ARM_ARCH_T2 */
+}
+__END_DECLS
+#endif
+
+#endif	/* !_ARM_LWP_PRIVATE_H_ */

package/libc/include/arm-netbsd-eabi/machine/mcontext.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.23 2021/10/06 05:33:15 skrll Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.27 2024/11/30 01:04:07 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -210,61 +210,15 @@ typedef struct {
 
 #endif
 
-#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
-    defined(__LIBPTHREAD_SOURCE__)
-
-#include <sys/tls.h>
-
-#if defined(__aarch64__)
-
-__BEGIN_DECLS
-static __inline void *
-__lwp_getprivate_fast(void)
-{
-	void *__tpidr;
-	__asm __volatile("mrs\t%0, tpidr_el0" : "=r"(__tpidr));
-	return __tpidr;
-}
-__END_DECLS
-
-#elif defined(__arm__)
-
-__BEGIN_DECLS
-static __inline void *
-__lwp_getprivate_fast(void)
-{
-#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
-	extern void *_lwp_getprivate(void);
-	void *rv;
-	__asm("mrc p15, 0, %0, c13, c0, 3" : "=r"(rv));
-	if (__predict_true(rv))
-		return rv;
-	/*
-	 * Some ARM cores are broken and don't raise an undefined fault when an
-	 * unrecogized mrc instruction is encountered, but just return zero.
-	 * To do deal with that, if we get a zero we (re-)fetch the value using
-	 * syscall.
-	 */
-	return _lwp_getprivate();
-#else
-	extern void *__aeabi_read_tp(void);
-	return __aeabi_read_tp();
-#endif /* !__thumb__ || _ARM_ARCH_T2 */
-}
-__END_DECLS
-#endif
-
-#endif /* _RTLD_SOURCE || _LIBC_SOURCE || __LIBPTHREAD_SOURCE__ */
-
 /* Machine-dependent uc_flags */
-#define _UC_TLSBASE	0x00080000	/* see <sys/ucontext.h> */
+#define _UC_TLSBASE	_UC_MD_BIT19	/* see <sys/ucontext.h> */
 
 /* Machine-dependent uc_flags for arm */
-#define	_UC_ARM_VFP	0x00010000	/* FPU field is VFP */
+#define	_UC_ARM_VFP	_UC_MD_BIT16	/* FPU field is VFP */
 
 /* used by signal delivery to indicate status of signal stack */
-#define _UC_SETSTACK	0x00020000
-#define _UC_CLRSTACK	0x00040000
+#define _UC_SETSTACK	_UC_MD_BIT17
+#define _UC_CLRSTACK	_UC_MD_BIT18
 
 #define _UC_MACHINE_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_SP])
 #define _UC_MACHINE_FP(uc)	((uc)->uc_mcontext.__gregs[_REG_FP])

package/libc/include/arm-netbsd-eabi/machine/mutex.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.27.4.1 2023/08/09 17:42:01 martin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.29 2023/07/12 12:50:12 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.

package/libc/include/arm-netbsd-eabi/machine/proc.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.19 2020/08/14 16:18:36 skrll Exp $	*/
+/*	$NetBSD: proc.h,v 1.20 2024/02/10 18:43:51 andvar Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -48,7 +48,7 @@ struct mdlwp {
 	volatile uint32_t md_astpending;
 };
 
-/* Flags setttings for md_flags */
+/* Flags settings for md_flags */
 #define MDLWP_NOALIGNFLT	0x00000002	/* For EXEC_AOUT */
 #define MDLWP_VFPINTR		0x00000004	/* VFP used in intr */
 

package/libc/include/arm-netbsd-eabi/machine/profile.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: profile.h,v 1.18 2018/01/24 09:04:45 skrll Exp $	*/
+/*	$NetBSD: profile.h,v 1.18.42.1 2026/04/02 19:12:03 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 Ben Harris
@@ -38,90 +38,25 @@
  * prologue.
  */
 
-#define MCOUNT_ASM_NAME "__mcount"
 #define	PLTSYM
 
-#if !defined(__ARM_EABI__)
-#define	MCOUNT								\
-	__asm(".text");							\
-	__asm(".align	0");						\
-	__asm(".arm");							\
-	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
-	__asm(".global	" MCOUNT_ASM_NAME);				\
-	__asm(MCOUNT_ASM_NAME ":");					\
-	/*								\
-	 * Preserve registers that are trashed during mcount		\
-	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	/* Check what mode we're in.  EQ => 32, NE => 26 */		\
-	__asm("teq	r0, r0");					\
-	__asm("teq	pc, r15");					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	__asm("moveq	r0, ip");					\
-	__asm("bicne	r0, ip, #0xfc000003");	       			\
-	/*								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	__asm("moveq	r1, lr");					\
-	__asm("bicne	r1, lr, #0xfc000003");				\
-	/*								\
-	 * Call the real mcount code					\
-	 */								\
-	__asm("bl	" ___STRING(_C_LABEL(_mcount)) PLTSYM);		\
-	/*								\
-	 * Restore registers that were trashed during mcount		\
-	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
-	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
-#elif defined(__ARM_DWARF_EH__)
-#define	MCOUNT								\
-	__asm(".text");							\
-	__asm(".align	0");						\
-	__asm(".arm");							\
-	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
-	__asm(".global	" MCOUNT_ASM_NAME);				\
-	__asm(MCOUNT_ASM_NAME ":");					\
-	__asm(".cfi_startproc");					\
-	/*								\
-	 * Preserve registers that are trashed during mcount		\
-	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	__asm(".cfi_def_cfa_offset 24");				\
-	__asm(".cfi_offset 14, -4");					\
-	__asm(".cfi_offset 12, -8");					\
-	__asm(".cfi_offset 3, -12");					\
-	__asm(".cfi_offset 2, -16");					\
-	__asm(".cfi_offset 1, -20");					\
-	__asm(".cfi_offset 0, -24");					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	__asm("mov	r0, ip");					\
-	/*								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	__asm("mov	r1, lr");					\
-	/*								\
-	 * Call the real mcount code					\
-	 */								\
-	__asm("bl	" ___STRING(_C_LABEL(_mcount)) PLTSYM);		\
-	/*								\
-	 * Restore registers that were trashed during mcount		\
-	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
-	__asm(".cfi_endproc");						\
-	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
+#if defined (_ARM_ARCH_4T)
+# define RET		"bx	ip"
+#else
+# define RET		"mov	pc, ip"
+#endif
+
+#if defined(__ARM_DWARF_EH__)
+#define _PROF_UNWINDER_SAVE	""
+#define _PROF_UNWINDER_START	""
+#define _PROF_UNWINDER_END	""
 #else
+#define _PROF_UNWINDER_SAVE	".save {r0-r3, lr}\n"
+#define _PROF_UNWINDER_START	".fnstart\n"
+#define _PROF_UNWINDER_END	".fnend\n"
+#endif
+
+#define MCOUNT_ASM_NAME "__gnu_mcount_nc"
 #define	MCOUNT								\
 	__asm(".text");							\
 	__asm(".align	0");						\
@@ -129,27 +64,26 @@
 	__asm(".type	" MCOUNT_ASM_NAME ",%function");		\
 	__asm(".global	" MCOUNT_ASM_NAME);				\
 	__asm(MCOUNT_ASM_NAME ":");					\
-	__asm(".fnstart");						\
+	__asm(_PROF_UNWINDER_START);					\
 	__asm(".cfi_startproc");					\
 	/*								\
 	 * Preserve registers that are trashed during mcount		\
 	 */								\
-	__asm("push	{r0-r3, ip, lr}");				\
-	__asm(".save {r0-r3, lr}");					\
-	__asm(".cfi_def_cfa_offset 24");				\
+	__asm("push	{r0-r3, lr}");					\
+	__asm(_PROF_UNWINDER_SAVE);					\
+	__asm(".cfi_def_cfa_offset 20");				\
 	__asm(".cfi_offset 14, -4");					\
-	__asm(".cfi_offset 12, -8");					\
-	__asm(".cfi_offset 3, -12");					\
-	__asm(".cfi_offset 2, -16");					\
-	__asm(".cfi_offset 1, -20");					\
-	__asm(".cfi_offset 0, -24");					\
+	__asm(".cfi_offset 3, -8");					\
+	__asm(".cfi_offset 2, -12");					\
+	__asm(".cfi_offset 1, -16");					\
+	__asm(".cfi_offset 0, -20");					\
 	/*								\
 	 * find the return address for mcount,				\
 	 * and the return address for mcount's caller.			\
 	 *								\
 	 * frompcindex = pc pushed by call into self.			\
 	 */								\
-	__asm("mov	r0, ip");					\
+	__asm("ldr	r0, [sp, #20]");				\
 	/*								\
 	 * selfpc = pc pushed by mcount call				\
 	 */								\
@@ -161,12 +95,10 @@
 	/*								\
 	 * Restore registers that were trashed during mcount		\
 	 */								\
-	__asm("pop	{r0-r3, lr}");					\
-	__asm("pop	{pc}");						\
+	__asm("pop	{r0-r3, ip, lr}");				\
+	__asm(RET);							\
 	__asm(".cfi_endproc");						\
-	__asm(".fnend");						\
 	__asm(".size	" MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
-#endif
 
 #ifdef _KERNEL
 #include <arm/cpufunc.h>

package/libc/include/arm-netbsd-eabi/machine/setjmp.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.h,v 1.5 2013/01/11 13:56:32 matt Exp $	*/
+/*	$NetBSD: setjmp.h,v 1.6 2024/05/06 07:29:30 skrll Exp $	*/
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
@@ -10,11 +10,12 @@
  * NOTE: The internal structure of a jmp_buf is *PRIVATE*
  *       This information is provided as there is software
  *       that fiddles with this with obtain the stack pointer
- *	 (yes really ! and its commercial !).
+ *	 (yes really ! and it's commercial !).
  *
  * Description of the setjmp buffer
  *
- * word  0	magic number	(dependent on creator)
+ * Word		Field		Comment
+ * 	0	magic number	(dependent on creator)
  *	13	fpscr		vfp status control register
  *	14	r4		register 4
  *	15	r5		register 5
@@ -47,13 +48,13 @@
  * A side note I should mention - Please do not tamper
  * with the floating point fields. While they are
  * always saved and restored at the moment this cannot
- * be garenteed especially if the compiler happens
+ * be guaranteed especially if the compiler happens
  * to be generating soft-float code so no fp
  * registers will be used.
  *
- * Whilst this can be seen an encouraging people to
+ * Whilst this can be seen as encouraging people to
  * use the setjmp buffer in this way I think that it
- * is for the best then if changes occur compiles will
+ * is for the best then, if changes occur, compiles will
  * break rather than just having new builds falling over
  * mysteriously.
  */