summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2021-10-13 16:03:07 +0000
committermartin <martin@NetBSD.org>2021-10-13 16:03:07 +0000
commit4585f9729bca5491f2e5fa6077284edcda018ff2 (patch)
treed5c27fd0095489161c8966d0982394effc5274d4 /lib
parent584d2536d4e07c1919b76908cf6beaf9a63c8990 (diff)
Pull up following revision(s) (requested by skrll in ticket #1358):
lib/libc/arch/aarch64/gen/setjmp.S: revision 1.4 lib/libc/arch/aarch64/gen/_setjmp.S: revision 1.5 Fix the lib/libc/setjmp/t_setjmp:{,_}longjmp_zero test cases
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/arch/aarch64/gen/_setjmp.S5
-rw-r--r--lib/libc/arch/aarch64/gen/setjmp.S7
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/libc/arch/aarch64/gen/_setjmp.S b/lib/libc/arch/aarch64/gen/_setjmp.S
index 74081063ea4..b6cea3c1874 100644
--- a/lib/libc/arch/aarch64/gen/_setjmp.S
+++ b/lib/libc/arch/aarch64/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.3.6.1 2020/05/13 12:34:41 martin Exp $ */
+/* $NetBSD: _setjmp.S,v 1.3.6.2 2021/10/13 16:03:07 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -99,7 +99,8 @@ ENTRY(_longjmp)
mov x29, x4
mov x30, x5
- mov x0, x1
+ cmp x1, #0
+ csinc x0, x1, xzr, ne
ret
/* validation failed, die die die. */
diff --git a/lib/libc/arch/aarch64/gen/setjmp.S b/lib/libc/arch/aarch64/gen/setjmp.S
index d906600a5d0..7b461868bbb 100644
--- a/lib/libc/arch/aarch64/gen/setjmp.S
+++ b/lib/libc/arch/aarch64/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*.$NetBSD: setjmp.S,v 1.2.6.1 2020/05/13 12:34:41 martin Exp $.*/
+/*.$NetBSD: setjmp.S,v 1.2.6.2 2021/10/13 16:03:07 martin Exp $.*/
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -114,8 +114,11 @@ ENTRY(__longjmp14)
bl _C_LABEL(__sigprocmask14)
ldp x29, x30, [sp, #16]
- ldr x0, [sp, #8]
+ ldr x1, [sp, #8]
add sp, sp, #32
+
+ cmp x1, #0
+ csinc x0, x1, xzr, ne
ret
/* validation failed, die die die. */