sigstack() is long dead, and the compat sigaltstack syscall is gone too.

Correct the namespace protections for sigreturn(), sigwait(), and psignal()

ok millert@

5 files changed, 10 insertions, 10 deletions

diff --git a/lib/libc/arch/m68k/gen/setjmp.S b/lib/libc/arch/m68k/gen/setjmp.S
index dac41aa5398..01ab2b39d76 100644
--- a/lib/libc/arch/m68k/gen/setjmp.S
+++ b/lib/libc/arch/m68k/gen/setjmp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: setjmp.S,v 1.4 2005/08/07 16:40:14 espie Exp $ */
+/* $OpenBSD: setjmp.S,v 1.5 2011/11/22 21:13:30 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -46,7 +46,7 @@
 #include "DEFS.h"
 
 ENTRY(setjmp)
-	subl	#12,sp		/* space for sigstack args/rvals */
+	subl	#12,sp		/* space for sigaltstack args/rvals */
 	clrl	sp@		/* don't change it... */
 	movl	sp,sp@(4)	/* ...but return the current val */
 	jbsr	_sigaltstack	/* note: flags returned in sp@(8) */
diff --git a/lib/libc/arch/mips64/gen/setjmp.S b/lib/libc/arch/mips64/gen/setjmp.S
index b534105b154..156c25046da 100644
--- a/lib/libc/arch/mips64/gen/setjmp.S
+++ b/lib/libc/arch/mips64/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*      $OpenBSD: setjmp.S,v 1.6 2009/12/11 05:10:15 miod Exp $ */
+/*      $OpenBSD: setjmp.S,v 1.7 2011/11/22 21:13:30 guenther Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -68,7 +68,7 @@ NON_LEAF(setjmp, FRAMESZ, ra)
 	and	v1, v1, 1			# extract onstack flag
 	REG_S	v1, SC_ONSTACK(a0)		# save it in sc_onstack
 	REG_L	ra, RAOFF(sp)
-	blt	v0, zero, botch			# check for sigstack() error
+	blt	v0, zero, botch			# check for sigaltstack() error
 	REG_S	ra, SC_PC(a0)			# sc_pc = return address
 #if defined(__mips64)
 	dli	v0, 0xACEDBADE			# sigcontext magic number
diff --git a/lib/libc/arch/powerpc/gen/setjmp.S b/lib/libc/arch/powerpc/gen/setjmp.S
index 01fde9d28e7..98bed38f84b 100644
--- a/lib/libc/arch/powerpc/gen/setjmp.S
+++ b/lib/libc/arch/powerpc/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.S,v 1.5 2004/03/01 18:05:50 drahn Exp $ */
+/*	$OpenBSD: setjmp.S,v 1.6 2011/11/22 21:13:30 guenther Exp $ */
 /*
  * Copyright (c) 1996 Dale Rahn. All rights reserved.
  *
@@ -66,7 +66,7 @@ ENTRY(setjmp)
 	li 3, 0
 	bl PIC_PLT(sigblock)
 	stw 3, JMP_sig(31)
-	/* should sigstack be checked and saved */
+	/* should sigaltstack be checked and saved */
 	mr 3, 31
 	lwz 0, JMP_lr(3)
 	mtlr 0
diff --git a/lib/libc/arch/sparc/gen/setjmp.S b/lib/libc/arch/sparc/gen/setjmp.S
index 10cc2932ac7..c16d8d70028 100644
--- a/lib/libc/arch/sparc/gen/setjmp.S
+++ b/lib/libc/arch/sparc/gen/setjmp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: setjmp.S,v 1.5 2005/08/07 16:40:15 espie Exp $ */
+/* $OpenBSD: setjmp.S,v 1.6 2011/11/22 21:13:30 guenther Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -58,7 +58,7 @@ ENTRY(setjmp)
 	t	ST_SYSCALL
 	st	%o0, [%o2 + 4]	/* sc.sc_mask = current mask; */
 	mov	SYS_sigaltstack, %g1
-	clr	%o0		/* sigstack(NULL, &foo) */
+	clr	%o0		/* sigaltstack(NULL, &foo) */
 	add	%sp, 0x48, %o1	/* (foo being in arg dump area) */
 	t	ST_SYSCALL
 	ld	[%sp + 0x50], %o0	/* foo.ss_flags */
diff --git a/lib/libc/arch/vax/gen/setjmp.S b/lib/libc/arch/vax/gen/setjmp.S
index ad931fd1691..2903134f530 100644
--- a/lib/libc/arch/vax/gen/setjmp.S
+++ b/lib/libc/arch/vax/gen/setjmp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: setjmp.S,v 1.7 2005/08/07 16:40:15 espie Exp $ */
+/* $OpenBSD: setjmp.S,v 1.8 2011/11/22 21:13:30 guenther Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -43,7 +43,7 @@
 
 ENTRY(setjmp, R6)
 	movl	4(ap),r6		# construct sigcontext
-	subl2	$12,sp			# space for current struct sigstack
+	subl2	$12,sp			# space for current struct sigaltstack
 	pushl	sp			# get current values
 	pushl	$0			# no new values
 	calls	$4,_C_LABEL(sigaltstack)# pop args plus signal stack value