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@

7 files changed, 15 insertions, 27 deletions

diff --git a/lib/libc/arch/arm/gen/_setjmp.S b/lib/libc/arch/arm/gen/_setjmp.S
index 8f63bf625cb..dca5158a01a 100644
--- a/lib/libc/arch/arm/gen/_setjmp.S
+++ b/lib/libc/arch/arm/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -101,6 +101,5 @@ ENTRY(_longjmp)
 
 	/* 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 */
diff --git a/lib/libc/arch/arm/gen/setjmp.S b/lib/libc/arch/arm/gen/setjmp.S
index d63012b7705..239a49d475c 100644
--- a/lib/libc/arch/arm/gen/setjmp.S
+++ b/lib/libc/arch/arm/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -130,6 +130,5 @@ ENTRY(longjmp)
 
 	/* 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 */
diff --git a/lib/libc/arch/m88k/gen/_setjmp.S b/lib/libc/arch/m88k/gen/_setjmp.S
index 8c7d306bc34..f443ee3785b 100644
--- a/lib/libc/arch/m88k/gen/_setjmp.S
+++ b/lib/libc/arch/m88k/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/* $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.
@@ -116,11 +116,9 @@ ENTRY(_longjmp)
 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 */
diff --git a/lib/libc/arch/m88k/gen/setjmp.S b/lib/libc/arch/m88k/gen/setjmp.S
index 60a0309859a..28dd10e4f7a 100644
--- a/lib/libc/arch/m88k/gen/setjmp.S
+++ b/lib/libc/arch/m88k/gen/setjmp.S
@@ -1,4 +1,4 @@
-/* $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.
@@ -136,11 +136,9 @@ ENTRY(longjmp)
 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 */
diff --git a/lib/libc/arch/m88k/gen/sigsetjmp.S b/lib/libc/arch/m88k/gen/sigsetjmp.S
index 342b79e5e55..97130701587 100644
--- a/lib/libc/arch/m88k/gen/sigsetjmp.S
+++ b/lib/libc/arch/m88k/gen/sigsetjmp.S
@@ -1,4 +1,4 @@
-/* $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.
@@ -145,11 +145,9 @@ ENTRY(siglongjmp)
 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 */
diff --git a/lib/libc/arch/mips64/gen/_setjmp.S b/lib/libc/arch/mips64/gen/_setjmp.S
index beabc9347d5..5797c97aac7 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.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)
@@ -157,8 +157,6 @@ LEAF(_longjmp, FRAMESZ)
 	move	v0, a1
 
 botch:
-	jal	longjmperror
-	nop
 	jal	_libc_abort
 	nop
 	RESTORE_GP64
diff --git a/lib/libc/arch/mips64/gen/setjmp.S b/lib/libc/arch/mips64/gen/setjmp.S
index dbe02d7bcad..36f1128c74b 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.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)
@@ -172,8 +172,6 @@ LEAF(longjmp, FRAMESZ)
 	move	v0, a4
 
 botch:
-	jal	longjmperror
-	nop
 	jal	_libc_abort
 	nop
 	RESTORE_GP64