Stop supporting longjmperror(); it's not used, not portable, and the checks longjmp performs can't really be relied upon, even after we got rid of the false positives...

ok millert@ deraadt@

include/setjmp.h

···
-/*	$OpenBSD: setjmp.h,v 1.6 2012/09/26 00:09:48 brad Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.7 2016/05/23 00:18:56 guenther Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.11 1994/12/20 10:35:44 cgd Exp $	*/
 
 /*-
···
 #if __BSD_VISIBLE || __XPG_VISIBLE
 __returns_twice int	_setjmp(jmp_buf);
 __dead void	_longjmp(jmp_buf, int);
-void	longjmperror(void);
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
 __END_DECLS
 

lib/libc/Symbols.list

···
 login_getclass
 login_getstyle
 longjmp
-longjmperror
 modf
 nftw
 nice

lib/libc/arch/arm/gen/_setjmp.S

···
-/*	$OpenBSD: _setjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $	*/
+/*	$OpenBSD: _setjmp.S,v 1.3 2016/05/23 00:18:57 guenther Exp $	*/
 /*	$NetBSD: _setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $	*/
 
 /*
···
 
 	/* validation failed, die die die. */
 botch:
-	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
-	bl	PIC_SYM(_C_LABEL(abort), PLT)
+	bl	PIC_SYM(_libc_abort, PLT)
 	b	. - 8		/* Cannot get here */

lib/libc/arch/arm/gen/setjmp.S

···
-/*	$OpenBSD: setjmp.S,v 1.3 2015/09/13 07:36:58 guenther Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.4 2016/05/23 00:18:57 guenther Exp $	*/
 /*	$NetBSD: setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $	*/
 
 /*
···
 
 	/* validation failed, die die die. */
 botch:
-	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
-	bl	PIC_SYM(_C_LABEL(abort), PLT)
+	bl	PIC_SYM(_libc_abort, PLT)
 	b	. - 8		/* Cannot get here */

lib/libc/arch/m88k/gen/_setjmp.S

···
-/* $OpenBSD: _setjmp.S,v 1.12 2013/01/20 17:59:52 miod Exp $ */
+/* $OpenBSD: _setjmp.S,v 1.13 2016/05/23 00:18:57 guenther Exp $ */
 /*-
  * Copyright (c) 2002 Steve Murphree, Jr.
  * All rights reserved.
···
 2:	subu	%r31,%r31,16	/* get a temporary stack */
 	st	%r1,%r31,0	/* save r1 on stack (return address) */
 #ifdef __PIC__
-	bsr	_C_LABEL(longjmperror)#plt
-	bsr	_C_LABEL(abort)#plt	/* NO RETURN */
+	bsr	_libc_abort#plt	/* NO RETURN */
 #else
-	bsr	_C_LABEL(longjmperror)
-	bsr	_C_LABEL(abort)	/* NO RETURN */
+	bsr	_libc_abort	/* NO RETURN */
 #endif
 	ld	%r1,%r31,0	/* restore r1 from stack */
 	jmp.n	%r1	/* this should not happen but we are prepared */

lib/libc/arch/m88k/gen/setjmp.S

···
-/* $OpenBSD: setjmp.S,v 1.14 2015/09/13 07:36:58 guenther Exp $ */
+/* $OpenBSD: setjmp.S,v 1.15 2016/05/23 00:18:57 guenther Exp $ */
 /*-
  * Copyright (c) 2002 Steve Murphree, Jr.
  * All rights reserved.
···
 2:	subu	%r31,%r31,16	/* get a temporary stack */
 	st	%r1,%r31,0	/* save r1 on stack (return address) */
 #ifdef __PIC__
-	bsr	_C_LABEL(longjmperror)#plt
-	bsr	_C_LABEL(abort)#plt	/* NO RETURN */
+	bsr	_libc_abort#plt	/* NO RETURN */
 #else
-	bsr	_C_LABEL(longjmperror)
-	bsr	_C_LABEL(abort)	/* NO RETURN */
+	bsr	_libc_abort	/* NO RETURN */
 #endif
 	ld	%r1,%r31,0	/* restore r1 from stack */
 	jmp.n	%r1	/* this should not happen but we are prepared */

lib/libc/arch/m88k/gen/sigsetjmp.S

···
-/* $OpenBSD: sigsetjmp.S,v 1.15 2015/09/13 07:36:58 guenther Exp $ */
+/* $OpenBSD: sigsetjmp.S,v 1.16 2016/05/23 00:18:57 guenther Exp $ */
 /*-
  * Copyright (c) 2002 Steve Murphree, Jr.
  * All rights reserved.
···
 2:	subu	%r31,%r31,16	/* get a temporary stack */
 	st	%r1,%r31,0	/* save r1 on stack (return address) */
 #ifdef __PIC__
-	bsr	_C_LABEL(longjmperror)#plt
-	bsr	_C_LABEL(abort)#plt	/* NO RETURN */
+	bsr	_libc_abort#plt	/* NO RETURN */
 #else
-	bsr	_C_LABEL(longjmperror)
-	bsr	_C_LABEL(abort)	/* NO RETURN */
+	bsr	_libc_abort	/* NO RETURN */
 #endif
 	ld	%r1,%r31,0	/* restore r1 from stack */
 	jmp.n	%r1	/* this should not happen but we are prepared */

lib/libc/arch/mips64/gen/_setjmp.S

···
-/*	$OpenBSD: _setjmp.S,v 1.5 2016/05/08 21:50:58 guenther Exp $ */
+/*	$OpenBSD: _setjmp.S,v 1.6 2016/05/23 00:18:57 guenther Exp $ */
 
 /*
  * Copyright (c) 2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
···
 	move	v0, a1
 
 botch:
-	jal	longjmperror
-	nop
 	jal	_libc_abort
 	nop
 	RESTORE_GP64

lib/libc/arch/mips64/gen/setjmp.S

···
-/*	$OpenBSD: setjmp.S,v 1.9 2016/05/08 21:50:58 guenther Exp $ */
+/*	$OpenBSD: setjmp.S,v 1.10 2016/05/23 00:18:57 guenther Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
···
 	move	v0, a4
 
 botch:
-	jal	longjmperror
-	nop
 	jal	_libc_abort
 	nop
 	RESTORE_GP64

lib/libc/gen/Makefile.inc

···
-#	$OpenBSD: Makefile.inc,v 1.73 2016/03/30 06:38:41 jmc Exp $
+#	$OpenBSD: Makefile.inc,v 1.74 2016/05/23 00:18:56 guenther Exp $
 
 # gen sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen
···
         nlist.c nftw.c opendir.c pause.c popen.c posix_spawn.c psignal.c \
         pw_dup.c pwcache.c raise.c readdir.c readdir_r.c readpassphrase.c \
         rewinddir.c scandir.c seekdir.c setdomainname.c sethostname.c \
-        setprogname.c setjmperr.c setmode.c setproctitle.c shm_open.c \
+        setprogname.c setmode.c setproctitle.c shm_open.c \
         siginterrupt.c siglist.c signal.c signame.c \
         sigsetops.c sleep.c statvfs.c strtofflags.c sysconf.c \
         syslog.c syslog_r.c telldir.c time.c times.c \

lib/libc/gen/setjmp.3

···
-.\"	$OpenBSD: setjmp.3,v 1.24 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: setjmp.3,v 1.25 2016/05/23 00:18:56 guenther Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
···
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: May 23 2016 $
 .Dt SETJMP 3
 .Os
 .Sh NAME
···
 .Nm setjmp ,
 .Nm longjmp ,
 .Nm _setjmp ,
-.Nm _longjmp ,
-.Nm longjmperror
+.Nm _longjmp
 .Nd non-local jumps
 .Sh SYNOPSIS
 .In setjmp.h
···
 .Fn _setjmp "jmp_buf env"
 .Ft void
 .Fn _longjmp "jmp_buf env" "int val"
-.Ft void
-.Fn longjmperror void
 .Sh DESCRIPTION
 The
 .Fn sigsetjmp ,
···
 function pairs save and restore the signal mask while the
 .Fn _setjmp Ns / Ns Fn _longjmp
 function pairs save and restore only the register set and the stack (see
-.Xr sigmask 3 ) .
+.Xr sigprocmask 2 ) .
 .Pp
 The
 .Fn sigsetjmp Ns / Ns Fn siglongjmp
···
 The
 .Fn sigsetjmp Ns / Ns Fn siglongjmp
 interfaces are preferred for maximum portability.
-.Sh ERRORS
-If the contents of the
-.Fa env
-are corrupted or correspond to an environment that has already returned,
-the
-.Fn longjmp
-routine calls the routine
-.Xr longjmperror 3 .
-If
-.Fn longjmperror
-returns, the program is aborted (see
-.Xr abort 3 ) .
-The default version of
-.Fn longjmperror
-prints the message
-.Dq Li longjmp botch
-to standard error and returns.
-User programs wishing to exit more gracefully should write their own
-versions of
-.Fn longjmperror .
 .Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr signal 3
+.Xr sigprocmask 2
 .Sh STANDARDS
 The
 .Fn setjmp

lib/libc/gen/setjmperr.c

···
-/*	$OpenBSD: setjmperr.c,v 1.5 2005/08/08 08:05:34 espie Exp $ */
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This routine is called from longjmp() when an error occurs.
- * Programs that wish to exit gracefully from this error may
- * write their own versions.
- * If this routine returns, the program is aborted.
- */
-
-#include <setjmp.h>
-#include <unistd.h>
-
-void
-longjmperror(void)
-{
-#define	ERRMSG	"longjmp botch.\n"
-	(void)write(STDERR_FILENO, ERRMSG, sizeof(ERRMSG) - 1);
-}