Module Name: src
Committed By: matt
Date: Tue Mar 4 06:27:00 UTC 2014
Modified Files:
src/lib/libc/compat/arch/m68k/gen: compat_setjmp.S
Log Message:
Avoid a warning and just do the trap #1 instead of calling sigreturn inline.
If it fails, it'll fall into the botch case so don't bother calling CERROR
on failure.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2 src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.3
--- src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S:1.2 Wed Jul 17 21:29:01 2013
+++ src/lib/libc/compat/arch/m68k/gen/compat_setjmp.S Tue Mar 4 06:27:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,7 +39,7 @@
#if 0
RCSID("from: @(#)setjmp.s 5.1 (Berkeley) 5/12/90")
#else
- RCSID("$NetBSD: compat_setjmp.S,v 1.2 2013/07/17 21:29:01 matt Exp $")
+ RCSID("$NetBSD: compat_setjmp.S,v 1.3 2014/03/04 06:27:00 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -88,8 +88,8 @@ ENTRY(longjmp)
moveq #1,%d0 /* else make non-zero */
ok:
moveml 28(%a0),#0x3CFC /* restore non-scratch regs */
- movl %a0,-(%sp) /* let sigreturn */
- jbsr PIC_PLT(_C_LABEL(sigreturn)) /* finish for us */
+ movl %a0,-(%sp) /* let sigreturn */
+ trap #1 /* finish via compat_13_sigreturn13() */
botch:
jbsr PIC_PLT(_C_LABEL(longjmperror))
