[src/trunk]: src/lib/libc/compat/arch/m68k/gen Avoid a warning and just do th...

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

details:   https://anonhg.NetBSD.org/src/rev/f0a3b9ba2d1f
branches:  trunk
changeset: 794037:f0a3b9ba2d1f
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 04 06:27:00 2014 +0000

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

diffstat:

 lib/libc/compat/arch/m68k/gen/compat_setjmp.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r a69265b12825 -r f0a3b9ba2d1f lib/libc/compat/arch/m68k/gen/compat_setjmp.S
--- a/lib/libc/compat/arch/m68k/gen/compat_setjmp.S     Tue Mar 04 06:15:33 2014 +0000
+++ b/lib/libc/compat/arch/m68k/gen/compat_setjmp.S     Tue Mar 04 06:27:00 2014 +0000
@@ -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 @@
        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))