_dl_cerror is trivial on alpha and m88k; just inline the hanlding into

the stubs

noted by miod@

3 files changed, 6 insertions, 14 deletions

diff --git a/libexec/ld.so/alpha/SYS.h b/libexec/ld.so/alpha/SYS.h
index cdbb4750511..004fe5f9c73 100644
--- a/libexec/ld.so/alpha/SYS.h
+++ b/libexec/ld.so/alpha/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.1 2017/08/27 21:59:52 deraadt Exp $ */
+/*	$OpenBSD: SYS.h,v 1.2 2019/02/03 02:20:36 guenther Exp $ */
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist
@@ -65,10 +65,7 @@
 LEAF_NOPROFILE(_dl_##c, irrelevant);					\
 	CALLSYS_NOERROR(c);						\
 	beq	a3, 1f;							\
-	jmp	zero, _dl_cerror;					\
+	subq	zero, v0, v0;	/* return -errno */			\
 1:									\
 	RET;								\
 END(_dl_##c)
-_dl_cerror:
-	subq	zero, v0, v0	/* return -errno */
-	RET
diff --git a/libexec/ld.so/m88k/SYS.h b/libexec/ld.so/m88k/SYS.h
index 1ed46724bc9..252cdf52173 100644
--- a/libexec/ld.so/m88k/SYS.h
+++ b/libexec/ld.so/m88k/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.2 2017/09/03 00:14:07 aoyama Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.3 2019/02/03 02:20:36 guenther Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -60,6 +60,6 @@
 #define DL_SYSCALL(n)					\
 	__ENTRY(_dl_,n);				\
 	__DO_SYSCALL(n);				\
-	br	_dl_cerror;				\
+	subu	%r2, %r0, %r2;	/* return (-errno); */	\
 	jmp	%r1;					\
 	END(_dl_##n)
diff --git a/libexec/ld.so/m88k/ldasm.S b/libexec/ld.so/m88k/ldasm.S
index f28d04b0dbe..23d82a9ab17 100644
--- a/libexec/ld.so/m88k/ldasm.S
+++ b/libexec/ld.so/m88k/ldasm.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldasm.S,v 1.28 2018/11/09 06:16:37 guenther Exp $	*/
+/*	$OpenBSD: ldasm.S,v 1.29 2019/02/03 02:20:36 guenther Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -157,13 +157,8 @@ ENTRY(_dl_bind_start)
 	 addu	%r31, %r31, REG_SIZE + PLT_FRAME_SIZE
 END(_dl_bind_start)
 
-ENTRY(_dl_cerror)
-	jmp.n	%r1
-	 subu	%r2, %r0, %r2
-END(_dl_cerror)
-
 ENTRY(_dl_cacheflush)
 	tb0	0, %r0, 451
-	br	_dl_cerror		| never hit
+	or	%r0, %r0, %r0				| never hit
 	jmp	%r1
 END(_dl_cacheflush)