Cleanup of abi call and endian stuff. Also fixed some bugs. (AENT).

33 files changed, 138 insertions, 344 deletions

diff --git a/lib/libc/arch/mips/SYS.h b/lib/libc/arch/mips/SYS.h
index 626aa183b37..6cb0c5074d2 100644
--- a/lib/libc/arch/mips/SYS.h
+++ b/lib/libc/arch/mips/SYS.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: SYS.h,v 1.3 1996/07/30 20:27:48 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,50 +35,48 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)SYS.h	8.1 (Berkeley) 6/4/93
- *      $Id: SYS.h,v 1.2 1996/05/16 11:15:57 pefo Exp $ 
+ *      $Id: SYS.h,v 1.3 1996/07/30 20:27:48 pefo Exp $ 
  */
 
 #include <sys/syscall.h>
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #ifdef __STDC__
-#ifdef ABICALLS
-#define RSYSCALL(x)     .abicalls; \
-			LEAF(x); .set noreorder; .cpload t9; .set reorder; \
-			li v0,SYS_ ## x; syscall; \
-			bne a3,zero,err; j ra; \
-			err: la t9, _C_LABEL(cerror); jr t9; END(x);
-#define PSEUDO(x,y)     .abicalls; \
-			LEAF(x); .set noreorder; .cpload t9; .set reorder; \
-			li v0,SYS_ ## y; syscall; \
-			bne a3,zero,err; j ra; \
-			err: la t9, _C_LABEL(cerror); jr t9; END(x);
-#else
-#define RSYSCALL(x)     LEAF(x); li v0,SYS_ ## x; syscall; \
-			bne a3,zero,err; j ra; err: j _C_LABEL(cerror); END(x);
-#define PSEUDO(x,y)     LEAF(x); li v0,SYS_ ## y; syscall; \
-			bne a3,zero,err; j ra; err: j _C_LABEL(cerror); END(x);
-#endif
-#else
-#ifdef ABICALLS
-#define RSYSCALL(x)     .abicalls; \
-			LEAF(x); .set noreorder; .cpload t9; .set reorder; \
-			li v0,SYS_/**/x; syscall; \
-			bne a3,zero,err; j ra; \
-			err: la t9, _C_LABEL(cerror); jr t9; END(x);
-#define PSEUDO(x,y)     .abicalls; \
-			LEAF(x); .set noreorder; .cpload t9; .set reorder; \
-			li v0,SYS_/**/y; syscall; \
-			bne a3,zero,err; j ra; \
-			err: la t9, _C_LABEL(cerror); jr t9; END(x);
+#define RSYSCALL(x)      \
+			LEAF(x);		\
+			li	v0,SYS_ ## x;	\
+			syscall;		\
+			bne	a3,zero,err;	\
+			j	ra;		\
+			err: la t9, cerror;	\
+			jr t9;			\
+			END(x);
+#define PSEUDO(x,y)     \
+			LEAF(x);		\
+			li	v0,SYS_ ## y;	\
+			syscall;		\
+			bne	a3,zero,err;	\
+			j	ra;		\
+			err: la t9, cerror;	\
+			jr t9;			\
+			END(x);
 #else
-#define RSYSCALL(x)     LEAF(x); li v0,SYS_/**/x; syscall; \
-			bne a3,zero,err; j ra; err: j _C_LABEL(cerror); END(x);
-#define PSEUDO(x,y)     LEAF(x); li v0,SYS_/**/y; syscall; \
-			bne a3,zero,err; j ra; err: j _C_LABEL(cerror); END(x);
-#endif
+#define RSYSCALL(x)     \
+			LEAF(x);		\
+			li	v0,SYS_/**/x;	\
+			syscall;		\
+			bne	a3,zero,err;	\
+			j	ra;		\
+			err: la t9, cerror;	\
+			jr	t9;		\
+			END(x);
+#define PSEUDO(x,y)     \
+			LEAF(x);		\
+			li	v0,SYS_/**/y;	\
+			syscall;		\
+			bne	a3,zero,err;	\
+			j	ra;		\
+			err: la t9, cerror;	\
+			jr t9;			\
+			END(x);
 #endif
diff --git a/lib/libc/arch/mips/gen/_setjmp.S b/lib/libc/arch/mips/gen/_setjmp.S
index 2595793639d..046639346d9 100644
--- a/lib/libc/arch/mips/gen/_setjmp.S
+++ b/lib/libc/arch/mips/gen/_setjmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: _setjmp.S,v 1.4 1996/07/30 20:27:49 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,19 +36,12 @@
  */
 
 #include <machine/regnum.h>
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: _setjmp.S,v 1.3 1996/05/16 11:15:59 pefo Exp $")
+	ASMSTR("$Id: _setjmp.S,v 1.4 1996/07/30 20:27:49 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -61,12 +55,8 @@
  * The previous signal state is NOT restored.
  */
 
-	.set	noreorder
-
 LEAF(_setjmp)
-#ifdef ABICALLS 
-	.cpload t9
-#endif  
+	.set	noreorder
 	li	v0, 0xACEDBADE			# sigcontext magic number
 	sw	ra, (2 * 4)(a0)			# sc_pc = return address
 	sw	v0, (3 * 4)(a0)			#   saved in sc_regs[0]
@@ -100,13 +90,10 @@ END(_setjmp)
 
 LEAF(_longjmp)
 #ifdef ABICALLS 
-	.set    noreorder
-	.cpload t9
-	.set    reorder
 	subu	sp, sp, 32
 	.cprestore 16
-	.set    noreorder
 #endif  
+	.set    noreorder
 	lw	v0, (3 * 4)(a0)			# get magic number
 	lw	ra, (2 * 4)(a0)
 	bne	v0, 0xACEDBADE, botch		# jump if error
diff --git a/lib/libc/arch/mips/gen/fabs.S b/lib/libc/arch/mips/gen/fabs.S
index c6d2f010759..4cccb47356d 100644
--- a/lib/libc/arch/mips/gen/fabs.S
+++ b/lib/libc/arch/mips/gen/fabs.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: fabs.S,v 1.3 1996/07/30 20:27:50 pefo Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,22 +35,14 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)fabs.s	8.1 (Berkeley) 2/16/94")
-	ASMSTR("$Id: fabs.S,v 1.2 1996/05/16 11:16:00 pefo Exp $")
+	ASMSTR("$Id: fabs.S,v 1.3 1996/07/30 20:27:50 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
-	.set	noreorder
 
 /*
  * fabs(x)
@@ -58,6 +51,7 @@
  * Return absolute value of x.
  */
 LEAF(fabs)
+	.set	noreorder
 	j	ra
 	abs.d	$f0, $f12		# compute absolute value of x
 END(fabs)
diff --git a/lib/libc/arch/mips/gen/isinf.S b/lib/libc/arch/mips/gen/isinf.S
index c742ed53368..a2f12276d98 100644
--- a/lib/libc/arch/mips/gen/isinf.S
+++ b/lib/libc/arch/mips/gen/isinf.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: isinf.S,v 1.3 1996/07/30 20:27:50 pefo Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,25 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)isinf.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: isinf.S,v 1.2 1996/05/16 11:16:00 pefo Exp $")
+	ASMSTR("$Id: isinf.S,v 1.3 1996/07/30 20:27:50 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-
 
 #define DEXP_INF	0x7ff
 
-	.set	noreorder
 
 /*
  * isnan(x)
@@ -61,6 +53,7 @@
  * Return true if x is a NAN.
  */
 LEAF(isnan)
+	.set	noreorder
 	mfc1	v1, $f13		# get MSW of x
 	mfc1	t3, $f12		# get LSW of x
 	sll	t1, v1, 1		# get x exponent
@@ -86,6 +79,7 @@ END(isnan)
  * Return true if x is infinity.
  */
 LEAF(isinf)
+	.set	noreorder
 	mfc1	v1, $f13		# get MSW of x
 	mfc1	t3, $f12		# get LSW of x
 	sll	t1, v1, 1		# get x exponent
diff --git a/lib/libc/arch/mips/gen/ldexp.S b/lib/libc/arch/mips/gen/ldexp.S
index 2cd22514fe0..2445793edc4 100644
--- a/lib/libc/arch/mips/gen/ldexp.S
+++ b/lib/libc/arch/mips/gen/ldexp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ldexp.S,v 1.3 1996/07/30 20:27:51 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,20 +35,13 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)ldexp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: ldexp.S,v 1.2 1996/05/16 11:16:01 pefo Exp $")
+	ASMSTR("$Id: ldexp.S,v 1.3 1996/07/30 20:27:51 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 #define DEXP_INF	0x7ff
 #define DEXP_BIAS	1023
@@ -69,6 +63,7 @@
  * Return x * (2**N), for integer values N.
  */
 LEAF(ldexp)
+	.set	reorder
 	mfc1	v1, $f13		# get MSW of x
 	mfc1	t3, $f12		# get LSW of x
 	sll	t1, v1, 1		# get x exponent
diff --git a/lib/libc/arch/mips/gen/modf.S b/lib/libc/arch/mips/gen/modf.S
index db24a8140d3..376f53621dc 100644
--- a/lib/libc/arch/mips/gen/modf.S
+++ b/lib/libc/arch/mips/gen/modf.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: modf.S,v 1.4 1996/07/30 20:27:51 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
@@ -38,22 +39,17 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)modf.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: modf.S,v 1.3 1996/07/25 09:58:33 pefo Exp $")
+	ASMSTR("$Id: modf.S,v 1.4 1996/07/30 20:27:51 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 /*
  * double modf(val, iptr)
  *	double val, *iptr;
  * returns: xxx and n (in *iptr) where val == n.xxx
  */
 LEAF(modf)
-        .set    noreorder
-        .cpload t9
-        .set    reorder
+	.set	reorder
 	cfc1	t0, $31			# get the control register
 	li.d	$f2, 4503599627370496e0 # f2 <- 2^52
 
diff --git a/lib/libc/arch/mips/gen/setjmp.S b/lib/libc/arch/mips/gen/setjmp.S
index 9213bab8dc7..dd9225eb48e 100644
--- a/lib/libc/arch/mips/gen/setjmp.S
+++ b/lib/libc/arch/mips/gen/setjmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: setjmp.S,v 1.4 1996/07/30 20:27:51 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,21 +36,14 @@
  */
 
 #include <sys/syscall.h>
-#include <machine/regnum.h>
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
+#include <machine/regnum.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: setjmp.S,v 1.3 1996/05/16 11:16:01 pefo Exp $")
+	ASMSTR("$Id: setjmp.S,v 1.4 1996/07/30 20:27:51 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /*
  * C library -- setjmp, longjmp
@@ -66,15 +60,11 @@
 
 NON_LEAF(setjmp, SETJMP_FRAME_SIZE, ra)
 	.mask	0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-#endif
 	subu	sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
 #ifdef ABICALLS
 	.cprestore 16
 #endif
+	.set	reorder
 	sw	ra, STAND_RA_OFFSET(sp)		# save state
 	sw	a0, SETJMP_FRAME_SIZE(sp)
 	move	a0, zero			# get current signal mask
@@ -127,12 +117,10 @@ END(setjmp)
 
 LEAF(longjmp)
 #ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
 	subu	sp, sp, 32
 	.cprestore 16
 #endif
+	.set	reorder
 	sw	a1, ((V0 + 3) * 4)(a0)	# save return value in sc_regs[V0]
 	li	v0, SYS_sigreturn
 	syscall
diff --git a/lib/libc/arch/mips/gen/sigsetjmp.S b/lib/libc/arch/mips/gen/sigsetjmp.S
index 9f778ab316b..fa687497e54 100644
--- a/lib/libc/arch/mips/gen/sigsetjmp.S
+++ b/lib/libc/arch/mips/gen/sigsetjmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigsetjmp.S,v 1.4 1996/07/30 20:27:52 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993, 1995,
  *	The Regents of the University of California.  All rights reserved.
@@ -36,21 +37,14 @@
 
 #include <sys/syscall.h>
 #include <machine/regnum.h>
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 #include <machine/setjmp.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sigsetjmp.S,v 1.3 1996/05/16 11:16:02 pefo Exp $")
+	ASMSTR("$Id: sigsetjmp.S,v 1.4 1996/07/30 20:27:52 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /*
  * C library -- sigsetjmp, siglongjmp
@@ -65,11 +59,7 @@
  */
 
 LEAF(sigsetjmp)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	sw	a1, (_JBLEN*4)(a0)		# save "savemask"
 	bne	a1, 0x0, 1f			# do saving of signal mask?
 	la	t9, _setjmp
@@ -80,11 +70,7 @@ LEAF(sigsetjmp)
 END(sigsetjmp)
 
 LEAF(siglongjmp)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	lw	t0, (_JBLEN * 4)(a0)		# get "savemask"
 	bne	t0, 0x0, 1f			# restore signal mask?
 	la	t9, _longjmp
diff --git a/lib/libc/arch/mips/net/htonl.S b/lib/libc/arch/mips/net/htonl.S
index 732a52e1912..ce35b6c92b3 100644
--- a/lib/libc/arch/mips/net/htonl.S
+++ b/lib/libc/arch/mips/net/htonl.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: htonl.S,v 1.3 1996/07/30 20:27:52 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,27 +35,21 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)htonl.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: htonl.S,v 1.2 1996/05/16 11:16:02 pefo Exp $")
+	ASMSTR("$Id: htonl.S,v 1.3 1996/07/30 20:27:52 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 /*
  * netorder = htonl(hostorder)
  * hostorder = ntohl(netorder)
  */
-NLEAF(htonl)				# a0 = 0x11223344, return 0x44332211
 ALEAF(ntohl)
+NLEAF(htonl)				# a0 = 0x11223344, return 0x44332211
+	.set	reorder
 #ifdef MIPSEL
 	srl	v1, a0, 24		# v1 = 0x00000011
 	sll	v0, a0, 24		# v0 = 0x44000000
diff --git a/lib/libc/arch/mips/net/htons.S b/lib/libc/arch/mips/net/htons.S
index 98e8cb061a2..ab3e90f1d0d 100644
--- a/lib/libc/arch/mips/net/htons.S
+++ b/lib/libc/arch/mips/net/htons.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: htons.S,v 1.3 1996/07/30 20:27:53 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,27 +35,21 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)htons.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: htons.S,v 1.2 1996/05/16 11:16:03 pefo Exp $")
+	ASMSTR("$Id: htons.S,v 1.3 1996/07/30 20:27:53 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 /*
  * netorder = htons(hostorder)
  * hostorder = ntohs(netorder)
  */
-NLEAF(htons)
 ALEAF(ntohs)
+NLEAF(htons)
+	.set	reorder
 #ifdef MIPSEL
 	srl	v0, a0, 8
 	and	v0, v0, 0xff
diff --git a/lib/libc/arch/mips/string/bcmp.S b/lib/libc/arch/mips/string/bcmp.S
index de1185f6bbd..ff4ce88412f 100644
--- a/lib/libc/arch/mips/string/bcmp.S
+++ b/lib/libc/arch/mips/string/bcmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bcmp.S,v 1.3 1996/07/30 20:27:53 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,36 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)bcmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: bcmp.S,v 1.2 1996/05/16 11:16:04 pefo Exp $")
+	ASMSTR("$Id: bcmp.S,v 1.3 1996/07/30 20:27:53 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 /* bcmp(s1, s2, n) */
 
-#ifdef MIPSEL
-#	define	LWHI	lwr
-#	define	LWLO	lwl
-#	define	SWHI	swr
-#	define	SWLO	swl
-#endif
-#ifdef MIPSEB
-#	define	LWHI	lwl
-#	define	LWLO	lwr
-#	define	SWHI	swl
-#	define	SWLO	swr
-#endif
-
 LEAF(bcmp)
 	.set	noreorder
 	blt	a2, 16, small		# is it worth any trouble?
diff --git a/lib/libc/arch/mips/string/bcopy.S b/lib/libc/arch/mips/string/bcopy.S
index 244f78314cd..1ea3d0cb1a5 100644
--- a/lib/libc/arch/mips/string/bcopy.S
+++ b/lib/libc/arch/mips/string/bcopy.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bcopy.S,v 1.3 1996/07/30 20:27:54 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,36 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)bcopy.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: bcopy.S,v 1.2 1996/05/16 11:16:04 pefo Exp $")
+	ASMSTR("$Id: bcopy.S,v 1.3 1996/07/30 20:27:54 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 /* bcopy(s1, s2, n) */
 
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-#ifdef MIPSEL
-#	define	LWHI	lwr
-#	define	LWLO	lwl
-#	define	SWHI	swr
-#	define	SWLO	swl
-#endif
-#ifdef MIPSEB
-#	define	LWHI	lwl
-#	define	LWLO	lwr
-#	define	SWHI	swl
-#	define	SWLO	swr
-#endif
-
 LEAF(bcopy)
 	.set	noreorder
 	addu	t0, a0, a2		# t0 = end of s1 region
diff --git a/lib/libc/arch/mips/string/bzero.S b/lib/libc/arch/mips/string/bzero.S
index c1ea25da295..f1a03b3c5f2 100644
--- a/lib/libc/arch/mips/string/bzero.S
+++ b/lib/libc/arch/mips/string/bzero.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bzero.S,v 1.3 1996/07/30 20:27:54 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,20 +35,13 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)bzero.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: bzero.S,v 1.2 1996/05/16 11:16:05 pefo Exp $")
+	ASMSTR("$Id: bzero.S,v 1.3 1996/07/30 20:27:54 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /* bzero(s1, n) */
 
@@ -58,7 +52,7 @@ LEAF(bzero)
 	and	a3, a3, 3
 	beq	a3, zero, 1f		# skip if word aligned
 	subu	a1, a1, a3		# subtract from remaining count
-	swr	zero, 0(a0)		# clear 1, 2, or 3 bytes to align
+	SWHI	zero, 0(a0)		# clear 1, 2, or 3 bytes to align
 	addu	a0, a0, a3
 1:
 	and	v0, a1, 3		# compute number of words left
diff --git a/lib/libc/arch/mips/string/ffs.S b/lib/libc/arch/mips/string/ffs.S
index d84b9fedc40..56f947bfe46 100644
--- a/lib/libc/arch/mips/string/ffs.S
+++ b/lib/libc/arch/mips/string/ffs.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ffs.S,v 1.3 1996/07/30 20:27:55 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,24 +35,18 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)ffs.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: ffs.S,v 1.2 1996/05/16 11:16:05 pefo Exp $")
+	ASMSTR("$Id: ffs.S,v 1.3 1996/07/30 20:27:55 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /* bit = ffs(value) */
 
 LEAF(ffs)
+	.set	reorder
 	move	v0, zero
 	beq	a0, zero, done
 1:
diff --git a/lib/libc/arch/mips/string/index.S b/lib/libc/arch/mips/string/index.S
index 2d89a987645..3365eda7804 100644
--- a/lib/libc/arch/mips/string/index.S
+++ b/lib/libc/arch/mips/string/index.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: index.S,v 1.3 1996/07/30 20:27:55 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,22 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)index.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: index.S,v 1.2 1996/05/16 11:16:06 pefo Exp $")
+	ASMSTR("$Id: index.S,v 1.3 1996/07/30 20:27:55 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(index)
+	.set	reorder
 	lbu	a2, 0(a0)		# get a byte
 	addu	a0, a0, 1
 	beq	a2, a1, fnd
diff --git a/lib/libc/arch/mips/string/rindex.S b/lib/libc/arch/mips/string/rindex.S
index bf1f1720495..3bc3aba9265 100644
--- a/lib/libc/arch/mips/string/rindex.S
+++ b/lib/libc/arch/mips/string/rindex.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rindex.S,v 1.3 1996/07/30 20:27:55 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,22 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)rindex.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: rindex.S,v 1.2 1996/05/16 11:16:06 pefo Exp $")
+	ASMSTR("$Id: rindex.S,v 1.3 1996/07/30 20:27:55 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(rindex)
+	.set	reorder
 	move	v0, zero		# default if not found
 1:
 	lbu	a3, 0(a0)		# get a byte
diff --git a/lib/libc/arch/mips/string/strcmp.S b/lib/libc/arch/mips/string/strcmp.S
index 4f46bc94a71..9302841c3af 100644
--- a/lib/libc/arch/mips/string/strcmp.S
+++ b/lib/libc/arch/mips/string/strcmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strcmp.S,v 1.3 1996/07/30 20:27:56 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,25 +35,19 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)strcmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: strcmp.S,v 1.2 1996/05/16 11:16:06 pefo Exp $")
+	ASMSTR("$Id: strcmp.S,v 1.3 1996/07/30 20:27:56 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /*
  * NOTE: this version assumes unsigned chars in order to be "8 bit clean".
  */
 LEAF(strcmp)
+	.set	reorder
 1:
 	lbu	t0, 0(a0)		# get two bytes and compare them
 	lbu	t1, 0(a1)
diff --git a/lib/libc/arch/mips/string/strlen.S b/lib/libc/arch/mips/string/strlen.S
index 8c009ddd8cb..ae829d636be 100644
--- a/lib/libc/arch/mips/string/strlen.S
+++ b/lib/libc/arch/mips/string/strlen.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strlen.S,v 1.3 1996/07/30 20:27:56 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,22 +35,16 @@
  * SUCH DAMAGE.
  */
 
-#if MACHINE==pica
 #include <machine/asm.h>
-#else
-#include <machine/machAsmDefs.h>
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)strlen.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: strlen.S,v 1.2 1996/05/16 11:16:07 pefo Exp $")
+	ASMSTR("$Id: strlen.S,v 1.3 1996/07/30 20:27:56 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(strlen)
+	.set	reorder
 	addu	v1, a0, 1
 1:
 	lb	v0, 0(a0)		# get byte from string
diff --git a/lib/libc/arch/mips/sys/Ovfork.S b/lib/libc/arch/mips/sys/Ovfork.S
index 5ea5d2d6827..e8e4d4aa689 100644
--- a/lib/libc/arch/mips/sys/Ovfork.S
+++ b/lib/libc/arch/mips/sys/Ovfork.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: Ovfork.S,v 1.3 1996/07/30 20:27:57 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,12 +39,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: Ovfork.S,v 1.2 1996/05/16 11:16:07 pefo Exp $")
+	ASMSTR("$Id: Ovfork.S,v 1.3 1996/07/30 20:27:57 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 /*
  * pid = vfork();
@@ -53,11 +51,7 @@
  */
 
 LEAF(vfork)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_vfork		# system call number for vfork
 	syscall
 	beq	a3, zero, 1f		# jump if no errors
diff --git a/lib/libc/arch/mips/sys/brk.S b/lib/libc/arch/mips/sys/brk.S
index 797a798c7ae..357baaacc98 100644
--- a/lib/libc/arch/mips/sys/brk.S
+++ b/lib/libc/arch/mips/sys/brk.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: brk.S,v 1.3 1996/07/30 20:27:57 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,12 +39,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: brk.S,v 1.2 1996/05/16 11:16:08 pefo Exp $")
+	ASMSTR("$Id: brk.S,v 1.3 1996/07/30 20:27:57 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 	.globl	minbrk
 	.globl	curbrk
@@ -53,15 +51,23 @@ minbrk:	.word	_C_LABEL(end)
 	.text
 
 LEAF(brk)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	lw	v0, minbrk
 	bgeu	a0, v0, _C_LABEL(_brk)
 	move	a0, v0		# dont allow break < minbrk
-ALEAF(_brk)
+	li	v0, SYS_break
+	syscall
+	bne	a3, zero, 1f
+	sw	a0, curbrk
+	move	v0, zero
+	j	ra
+1:
+	la	t9, _C_LABEL(cerror)
+	jr	t9
+END(brk)
+
+LEAF(_brk)
+	.set	reorder
 	li	v0, SYS_break
 	syscall
 	bne	a3, zero, 1f
diff --git a/lib/libc/arch/mips/sys/cerror.S b/lib/libc/arch/mips/sys/cerror.S
index c74a2449b83..d0f237fb8c6 100644
--- a/lib/libc/arch/mips/sys/cerror.S
+++ b/lib/libc/arch/mips/sys/cerror.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cerror.S,v 1.3 1996/07/30 20:27:57 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,12 +39,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
-	ASMSTR("$Id: cerror.S,v 1.2 1996/05/16 11:16:08 pefo Exp $")
+	ASMSTR("$Id: cerror.S,v 1.3 1996/07/30 20:27:57 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 	.globl	_C_LABEL(errno)
 LEAF(cerror)
diff --git a/lib/libc/arch/mips/sys/exect.S b/lib/libc/arch/mips/sys/exect.S
index 6b5f30f8db0..d02177f87c9 100644
--- a/lib/libc/arch/mips/sys/exect.S
+++ b/lib/libc/arch/mips/sys/exect.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: exect.S,v 1.3 1996/07/30 20:27:58 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,11 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: exect.S,v 1.2 1996/05/16 11:16:09 pefo Exp $")
+	ASMSTR("$Id: exect.S,v 1.3 1996/07/30 20:27:58 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-
 LEAF(exect)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_execve
 	syscall
 	bne	a3, zero, 1f
diff --git a/lib/libc/arch/mips/sys/fork.S b/lib/libc/arch/mips/sys/fork.S
index aa41a5918bb..4a41b33a9ee 100644
--- a/lib/libc/arch/mips/sys/fork.S
+++ b/lib/libc/arch/mips/sys/fork.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: fork.S,v 1.3 1996/07/30 20:27:58 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: fork.S,v 1.2 1996/05/16 11:16:09 pefo Exp $")
+	ASMSTR("$Id: fork.S,v 1.3 1996/07/30 20:27:58 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(fork)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_fork	# pid = fork()
 	syscall
 	bne	a3, zero, 2f
diff --git a/lib/libc/arch/mips/sys/pipe.S b/lib/libc/arch/mips/sys/pipe.S
index 9a8e549cf95..1cacf5b1399 100644
--- a/lib/libc/arch/mips/sys/pipe.S
+++ b/lib/libc/arch/mips/sys/pipe.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pipe.S,v 1.3 1996/07/30 20:27:58 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: pipe.S,v 1.2 1996/05/16 11:16:09 pefo Exp $")
+	ASMSTR("$Id: pipe.S,v 1.3 1996/07/30 20:27:58 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(pipe)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_pipe	# pipe(fildes) int fildes[2];
 	syscall
 	bne	a3, zero, 1f
diff --git a/lib/libc/arch/mips/sys/ptrace.S b/lib/libc/arch/mips/sys/ptrace.S
index 4f174b4e621..a8fad40d45d 100644
--- a/lib/libc/arch/mips/sys/ptrace.S
+++ b/lib/libc/arch/mips/sys/ptrace.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ptrace.S,v 1.3 1996/07/30 20:27:59 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,11 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: ptrace.S,v 1.2 1996/05/16 11:16:10 pefo Exp $")
+	ASMSTR("$Id: ptrace.S,v 1.3 1996/07/30 20:27:59 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-
 LEAF(ptrace)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	sw	zero, _C_LABEL(errno)
 	li	v0, SYS_ptrace
 	syscall
diff --git a/lib/libc/arch/mips/sys/reboot.S b/lib/libc/arch/mips/sys/reboot.S
index 638f2fab47d..4a9cebe76ff 100644
--- a/lib/libc/arch/mips/sys/reboot.S
+++ b/lib/libc/arch/mips/sys/reboot.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: reboot.S,v 1.3 1996/07/30 20:27:59 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,21 +39,16 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)reboot.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: reboot.S,v 1.2 1996/05/16 11:16:10 pefo Exp $")
+	ASMSTR("$Id: reboot.S,v 1.3 1996/07/30 20:27:59 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(reboot)
 #ifdef ABICALLS
-	.set	noreorder
-	.cpload t9
-	.set	reorder
 	subu	sp, sp, 32
 	.cprestore 16
 #endif
+	.set	reorder
 	li	v0, SYS_reboot
 	syscall
 	bne	a3, zero, 1f
diff --git a/lib/libc/arch/mips/sys/sbrk.S b/lib/libc/arch/mips/sys/sbrk.S
index 5d5ac98fe62..4f4bfaeef23 100644
--- a/lib/libc/arch/mips/sys/sbrk.S
+++ b/lib/libc/arch/mips/sys/sbrk.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sbrk.S,v 1.3 1996/07/30 20:27:59 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,13 +39,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sbrk.S,v 1.2 1996/05/16 11:16:11 pefo Exp $")
+	ASMSTR("$Id: sbrk.S,v 1.3 1996/07/30 20:27:59 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-
 	.globl	curbrk
 
 	.data
@@ -52,15 +49,12 @@ curbrk:	.word	_C_LABEL(end)
 	.text
 
 LEAF(sbrk)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	lw	v1, curbrk
 	li	v0, SYS_break
 	addu	a0, a0, v1	# compute current break
 	syscall
+
 	bne	a3, zero, 1f
 	move	v0, v1		# return old val of curbrk from above
 	sw	a0, curbrk	# save current val of curbrk from above
diff --git a/lib/libc/arch/mips/sys/setlogin.S b/lib/libc/arch/mips/sys/setlogin.S
index 4b2b66a50b0..8e3297ccad8 100644
--- a/lib/libc/arch/mips/sys/setlogin.S
+++ b/lib/libc/arch/mips/sys/setlogin.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: setlogin.S,v 1.3 1996/07/30 20:28:00 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,21 +39,15 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)setlogin.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: setlogin.S,v 1.2 1996/05/16 11:16:11 pefo Exp $")
+	ASMSTR("$Id: setlogin.S,v 1.3 1996/07/30 20:28:00 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(setlogin)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_setlogin		# setlogin(name)
 	syscall
+
 	bne	a3, zero, 1f
 	sw	zero, _C_LABEL(__logname_valid)	# in getlogin()
 	j	ra
diff --git a/lib/libc/arch/mips/sys/sigpending.S b/lib/libc/arch/mips/sys/sigpending.S
index 1e23b009206..8c6729bb806 100644
--- a/lib/libc/arch/mips/sys/sigpending.S
+++ b/lib/libc/arch/mips/sys/sigpending.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigpending.S,v 1.3 1996/07/30 20:28:00 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sigpending.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sigpending.S,v 1.2 1996/05/16 11:16:12 pefo Exp $")
+	ASMSTR("$Id: sigpending.S,v 1.3 1996/07/30 20:28:00 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(sigpending)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	li	v0, SYS_sigpending	# setlogin(name)
 	syscall
 	bne	a3, zero, 1f
diff --git a/lib/libc/arch/mips/sys/sigprocmask.S b/lib/libc/arch/mips/sys/sigprocmask.S
index 2b2b51d4463..52e083b4ade 100644
--- a/lib/libc/arch/mips/sys/sigprocmask.S
+++ b/lib/libc/arch/mips/sys/sigprocmask.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigprocmask.S,v 1.3 1996/07/30 20:28:01 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sigprocmask.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sigprocmask.S,v 1.2 1996/05/16 11:16:12 pefo Exp $")
+	ASMSTR("$Id: sigprocmask.S,v 1.3 1996/07/30 20:28:01 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(sigprocmask)	# sigprocmask(how, new, old) sigset_t *new, *old;
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	bne	a1, zero, gotptr	# if new sigset pointer not null
 	li	a0, 1			# how = SIG_BLOCK
 	b	doit			# mask = zero
diff --git a/lib/libc/arch/mips/sys/sigreturn.S b/lib/libc/arch/mips/sys/sigreturn.S
index 7af4c5be2ce..5b0513cf462 100644
--- a/lib/libc/arch/mips/sys/sigreturn.S
+++ b/lib/libc/arch/mips/sys/sigreturn.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigreturn.S,v 1.3 1996/07/30 20:28:01 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,13 +39,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sigreturn.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sigreturn.S,v 1.2 1996/05/16 11:16:13 pefo Exp $")
+	ASMSTR("$Id: sigreturn.S,v 1.3 1996/07/30 20:28:01 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
-
 /*
  * We must preserve the state of the registers as the user has set them up.
  */
diff --git a/lib/libc/arch/mips/sys/sigsuspend.S b/lib/libc/arch/mips/sys/sigsuspend.S
index d7edf2a3077..062c490df1c 100644
--- a/lib/libc/arch/mips/sys/sigsuspend.S
+++ b/lib/libc/arch/mips/sys/sigsuspend.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigsuspend.S,v 1.3 1996/07/30 20:28:01 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,19 +39,12 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sigsuspend.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: sigsuspend.S,v 1.2 1996/05/16 11:16:13 pefo Exp $")
+	ASMSTR("$Id: sigsuspend.S,v 1.3 1996/07/30 20:28:01 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 LEAF(sigsuspend)
-#ifdef ABICALLS
-	.set	noreorder
-	.cpload	t9
 	.set	reorder
-#endif
 	lw	a0, 0(a0)		# indirect to mask arg
 	li	v0, SYS_sigsuspend
 	syscall
diff --git a/lib/libc/arch/mips/sys/syscall.S b/lib/libc/arch/mips/sys/syscall.S
index 8ea3e16d6cb..76363245cbb 100644
--- a/lib/libc/arch/mips/sys/syscall.S
+++ b/lib/libc/arch/mips/sys/syscall.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: syscall.S,v 1.3 1996/07/30 20:28:02 pefo Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,13 +39,10 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$Id: syscall.S,v 1.2 1996/05/16 11:16:13 pefo Exp $")
+	ASMSTR("$Id: syscall.S,v 1.3 1996/07/30 20:28:02 pefo Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 #define SYS_syscall	0
 
-#ifdef ABICALLS
-	.abicalls
-#endif
 
 RSYSCALL(syscall)