[src/netbsd-9]: src/lib/libc/arch/aarch64/gen Pull up following revision(s) (...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/05bb8f00e7ef
branches:  netbsd-9
changeset: 989480:05bb8f00e7ef
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Oct 13 16:03:07 2021 +0000

description:
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:

 lib/libc/arch/aarch64/gen/_setjmp.S |  5 +++--
 lib/libc/arch/aarch64/gen/setjmp.S  |  7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 072e68a3889e -r 05bb8f00e7ef lib/libc/arch/aarch64/gen/_setjmp.S
--- a/lib/libc/arch/aarch64/gen/_setjmp.S       Fri Oct 08 14:59:08 2021 +0000
+++ b/lib/libc/arch/aarch64/gen/_setjmp.S       Wed Oct 13 16:03:07 2021 +0000
@@ -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 @@
        mov     x29, x4
        mov     x30, x5
 
-       mov     x0, x1
+       cmp     x1, #0
+       csinc   x0, x1, xzr, ne
        ret
 
        /* validation failed, die die die. */
diff -r 072e68a3889e -r 05bb8f00e7ef lib/libc/arch/aarch64/gen/setjmp.S
--- a/lib/libc/arch/aarch64/gen/setjmp.S        Fri Oct 08 14:59:08 2021 +0000
+++ b/lib/libc/arch/aarch64/gen/setjmp.S        Wed Oct 13 16:03:07 2021 +0000
@@ -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 @@
        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. */