Get static rcsid correctly, better style for .S files, trim whitespace.

30 files changed, 167 insertions, 156 deletions

diff --git a/lib/libc/arch/m88k/gen/_setjmp.S b/lib/libc/arch/m88k/gen/_setjmp.S
index a5f7924df52..393b3aefe09 100644
--- a/lib/libc/arch/m88k/gen/_setjmp.S
+++ b/lib/libc/arch/m88k/gen/_setjmp.S
@@ -29,8 +29,8 @@
  */
 
 #if defined(LIBC_SCCS)
-	.text
-	.string "$OpenBSD: _setjmp.S,v 1.4 2003/01/04 00:13:11 miod Exp $\0"
+	.data
+	.string "$OpenBSD: _setjmp.S,v 1.5 2003/01/07 22:01:29 miod Exp $"
 #endif /* LIBC_SCCS */
 
 #include "SYS.h"
@@ -43,18 +43,18 @@
  * the last call to
  *	_setjmp(a)
  * by restoring registers from the stack,
- * The previous signal state is NOT saved 
+ * The previous signal state is NOT saved
  * or restored.
  *
- * For m88k, we define our jmp_buf length 
+ * For m88k, we define our jmp_buf length
  * to be the size of 22 longs.  <machine/setjmp.h>
  * The buffer's usage is as follows:
- * 
+ *
  * jmp_buf[0]		return address
  * jmp_buf[1]		signal set (if used)
  * jmp_buf[2 to 19]	r14 to r31
  * jmp_buf[20]		'used' flag
- * jmp_buf[21]		setjmp type 
+ * jmp_buf[21]		setjmp type
  *
  */
 
diff --git a/lib/libc/arch/m88k/gen/fabs.S b/lib/libc/arch/m88k/gen/fabs.S
index 0e9d540ff0a..0e30b1fba10 100644
--- a/lib/libc/arch/m88k/gen/fabs.S
+++ b/lib/libc/arch/m88k/gen/fabs.S
@@ -28,7 +28,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/asm.h>
+#if defined(LIBC_SCCS)
+	.data
+	.string "$OpenBSD: fabs.S,v 1.3 2003/01/07 22:01:29 miod Exp $"
+#endif /* LIBC_SCCS */
+
+#include "DEFS.h"
+
 /*
  * Will work only if the argument passed is in IEEE format!
  */
@@ -41,4 +47,4 @@ ENTRY(fabs)
 	st.b	r4,r31,32
 	ld.d	r2,r31,32
 	jmp.n	r1
-	addu	r31,r31,40
+	 addu	r31,r31,40
diff --git a/lib/libc/arch/m88k/gen/fpgetmask.c b/lib/libc/arch/m88k/gen/fpgetmask.c
index 832fe0de567..a9b4ff8d774 100644
--- a/lib/libc/arch/m88k/gen/fpgetmask.c
+++ b/lib/libc/arch/m88k/gen/fpgetmask.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpgetmask.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpgetmask.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_except
 fpgetmask()
 {
diff --git a/lib/libc/arch/m88k/gen/fpgetround.c b/lib/libc/arch/m88k/gen/fpgetround.c
index 4edac881ff9..d1eaf916b00 100644
--- a/lib/libc/arch/m88k/gen/fpgetround.c
+++ b/lib/libc/arch/m88k/gen/fpgetround.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpgetround.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpgetround.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_rnd
 fpgetround()
 {
diff --git a/lib/libc/arch/m88k/gen/fpgetsticky.c b/lib/libc/arch/m88k/gen/fpgetsticky.c
index 6d5bdc7bbde..cd8d08aea9a 100644
--- a/lib/libc/arch/m88k/gen/fpgetsticky.c
+++ b/lib/libc/arch/m88k/gen/fpgetsticky.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpgetsticky.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpgetsticky.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_except
 fpgetsticky()
 {
diff --git a/lib/libc/arch/m88k/gen/fpsetmask.c b/lib/libc/arch/m88k/gen/fpsetmask.c
index 42d88a7f641..2d6617e296c 100644
--- a/lib/libc/arch/m88k/gen/fpsetmask.c
+++ b/lib/libc/arch/m88k/gen/fpsetmask.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpsetmask.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpsetmask.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_except
 fpsetmask(mask)
 	fp_except mask;
diff --git a/lib/libc/arch/m88k/gen/fpsetround.c b/lib/libc/arch/m88k/gen/fpsetround.c
index 417eefefa87..0353a26d726 100644
--- a/lib/libc/arch/m88k/gen/fpsetround.c
+++ b/lib/libc/arch/m88k/gen/fpsetround.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpsetround.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpsetround.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_rnd
 fpsetround(rnd_dir)
 	fp_rnd rnd_dir;
diff --git a/lib/libc/arch/m88k/gen/fpsetsticky.c b/lib/libc/arch/m88k/gen/fpsetsticky.c
index 2c3f4c8c6d8..188126c0fe8 100644
--- a/lib/libc/arch/m88k/gen/fpsetsticky.c
+++ b/lib/libc/arch/m88k/gen/fpsetsticky.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: fpsetsticky.c,v 1.2 2003/01/07 22:01:29 miod Exp $	*/
+
 /*
  * Written by J.T. Conklin, Apr 10, 1995
  * Public domain.
@@ -6,6 +8,10 @@
 
 #include <ieeefp.h>
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: fpsetsticky.c,v 1.2 2003/01/07 22:01:29 miod Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 fp_except
 fpsetsticky(sticky)
 	fp_except sticky;
diff --git a/lib/libc/arch/m88k/gen/ldexp.c b/lib/libc/arch/m88k/gen/ldexp.c
index 81ebe2b070a..2de505c5b34 100644
--- a/lib/libc/arch/m88k/gen/ldexp.c
+++ b/lib/libc/arch/m88k/gen/ldexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldexp.c,v 1.2 2000/03/01 17:31:20 todd Exp $	*/
+/*	$OpenBSD: ldexp.c,v 1.3 2003/01/07 22:01:29 miod Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
+static char sccsid[] = "$OpenBSD: ldexp.c,v 1.3 2003/01/07 22:01:29 miod Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/m88k/gen/modf.c b/lib/libc/arch/m88k/gen/modf.c
index 5c307f0c55f..75c5d27b5a1 100644
--- a/lib/libc/arch/m88k/gen/modf.c
+++ b/lib/libc/arch/m88k/gen/modf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modf.c,v 1.5 2002/02/19 22:12:36 millert Exp $	*/
+/*	$OpenBSD: modf.c,v 1.6 2003/01/07 22:01:29 miod Exp $	*/
 /* @(#)s_modf.c 5.1 93/09/24 */
 /*
  * ====================================================
@@ -11,9 +11,9 @@
  * ====================================================
  */
 
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: modf.c,v 1.5 2002/02/19 22:12:36 millert Exp $";
-#endif
+#if defined(LIBC_SCCS) && !defined(lint)
+static char rcsid[] = "$OpenBSD: modf.c,v 1.6 2003/01/07 22:01:29 miod Exp $";
+#endif	/* LIBC_SCCS and not lint */
 
 /*
  * modf(double x, double *iptr) 
diff --git a/lib/libc/arch/m88k/gen/setjmp.S b/lib/libc/arch/m88k/gen/setjmp.S
index 01b8f132899..d8a3cb4f36f 100644
--- a/lib/libc/arch/m88k/gen/setjmp.S
+++ b/lib/libc/arch/m88k/gen/setjmp.S
@@ -29,8 +29,8 @@
  */
 
 #if defined(LIBC_SCCS)
-	.text
-	.string "$OpenBSD: setjmp.S,v 1.4 2003/01/04 00:13:11 miod Exp $\0"
+	.data
+	.string "$OpenBSD: setjmp.S,v 1.5 2003/01/07 22:01:29 miod Exp $"
 #endif /* LIBC_SCCS */
 
 #include "SYS.h"
@@ -45,15 +45,15 @@
  * by restoring registers from the stack,
  * and a struct sigcontext, see <signal.h>
  *
- * For m88k, we define our jmp_buf length 
+ * For m88k, we define our jmp_buf length
  * to be the size of 22 longs.  <machine/setjmp.h>
  * The buffer's usage is as follows:
- * 
+ *
  * jmp_buf[0]		return address
  * jmp_buf[1]		signal set (if used)
  * jmp_buf[2 to 19]	r14 to r31
  * jmp_buf[20]		'used' flag
- * jmp_buf[21]		setjmp type 
+ * jmp_buf[21]		setjmp type
  *
  */
 
diff --git a/lib/libc/arch/m88k/gen/sigsetjmp.S b/lib/libc/arch/m88k/gen/sigsetjmp.S
index fca01f6f31a..87a6649b5eb 100644
--- a/lib/libc/arch/m88k/gen/sigsetjmp.S
+++ b/lib/libc/arch/m88k/gen/sigsetjmp.S
@@ -29,8 +29,8 @@
  */
 
 #if defined(LIBC_SCCS)
-	.text
-	.string "$OpenBSD: sigsetjmp.S,v 1.4 2003/01/04 00:13:11 miod Exp $\0"
+	.data
+	.string "$OpenBSD: sigsetjmp.S,v 1.5 2003/01/07 22:01:29 miod Exp $"
 #endif /* LIBC_SCCS */
 
 #include "SYS.h"
@@ -45,15 +45,15 @@
  * by restoring registers from the stack,
  * The previous signal state is restored if 'm' was non-zero.
  *
- * For m88k, we define our jmp_buf length 
+ * For m88k, we define our jmp_buf length
  * to be the size of 22 longs.  <machine/setjmp.h>
  * The buffer's usage is as follows:
- * 
+ *
  * jmp_buf[0]		return address
  * jmp_buf[1]		signal set (if used)
  * jmp_buf[2 to 19]	r14 to r31
  * jmp_buf[20]		'used' flag
- * jmp_buf[21]		setjmp type 
+ * jmp_buf[21]		setjmp type
  *
  */
 
diff --git a/lib/libc/arch/m88k/net/htonl.S b/lib/libc/arch/m88k/net/htonl.S
index 17407e849c1..bb4d8577201 100644
--- a/lib/libc/arch/m88k/net/htonl.S
+++ b/lib/libc/arch/m88k/net/htonl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htonl.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: htonl.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,15 +37,14 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)htonl.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: htonl.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-#endif /* LIBC_SCCS and not lint */
-
-/* netorder = htonl(hostorder) */
+#if defined(LIBC_SCCS)
+	.data
+	.string "$OpenBSD: htonl.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "DEFS.h"
 
+/* netorder = htonl(hostorder) */
+
 ENTRY(htonl)
 	jmp	r1
diff --git a/lib/libc/arch/m88k/net/htons.S b/lib/libc/arch/m88k/net/htons.S
index 5b7fec99f4f..f85c16fedfe 100644
--- a/lib/libc/arch/m88k/net/htons.S
+++ b/lib/libc/arch/m88k/net/htons.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: htons.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: htons.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,16 +37,15 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)htons.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: htons.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-#endif /* LIBC_SCCS and not lint */
-
-/* hostorder = htons(netorder) */
+#if defined(LIBC_SCCS)
+	.data
+	.string "$OpenBSD: htons.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "DEFS.h"
 
+/* hostorder = htons(netorder) */
+
 ENTRY(htons)
 	jmp.n	r1
-	clr	r2,r2,16<16> /* clear the top 16 bits */
+	 clr	r2,r2,16<16> /* clear the top 16 bits */
diff --git a/lib/libc/arch/m88k/net/ntohl.S b/lib/libc/arch/m88k/net/ntohl.S
index 7a538893ea6..65692deaae8 100644
--- a/lib/libc/arch/m88k/net/ntohl.S
+++ b/lib/libc/arch/m88k/net/ntohl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohl.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: ntohl.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,15 +37,14 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)ntohl.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: ntohl.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-#endif /* LIBC_SCCS and not lint */
-
-/* hostorder = ntohl(netorder) */
+#if defined(LIBC_SCCS)
+	.data
+	.string "$OpenBSD: ntohl.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "DEFS.h"
 
+/* hostorder = ntohl(netorder) */
+
 ENTRY(ntohl)
 	jmp	r1
diff --git a/lib/libc/arch/m88k/net/ntohs.S b/lib/libc/arch/m88k/net/ntohs.S
index 43f1547f88d..98ee230fecd 100644
--- a/lib/libc/arch/m88k/net/ntohs.S
+++ b/lib/libc/arch/m88k/net/ntohs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntohs.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: ntohs.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,16 +37,15 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	/*.asciz "from: @(#)ntohs.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: ntohs.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-#endif /* LIBC_SCCS and not lint */
-
-/* hostorder = ntohs(netorder) */
+#if defined(LIBC_SCCS)
+	.data
+	.string "$OpenBSD: ntohs.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "DEFS.h"
 
+/* hostorder = ntohs(netorder) */
+
 ENTRY(ntohs)
 	jmp.n	r1
-	clr	r2,r2,16<16>	/* clear the top 16 bits */
+	 clr	r2,r2,16<16>	/* clear the top 16 bits */
diff --git a/lib/libc/arch/m88k/sys/Ovfork.S b/lib/libc/arch/m88k/sys/Ovfork.S
index e59567862cb..f84000d6382 100644
--- a/lib/libc/arch/m88k/sys/Ovfork.S
+++ b/lib/libc/arch/m88k/sys/Ovfork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: Ovfork.S,v 1.3 2003/01/02 21:40:46 miod Exp $	*/
+/*	$OpenBSD: Ovfork.S,v 1.4 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)fork.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: Ovfork.S,v 1.3 2003/01/02 21:40:46 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: Ovfork.S,v 1.4 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/m88k/sys/brk.S b/lib/libc/arch/m88k/sys/brk.S
index a5b5e874d87..78199cdb4bd 100644
--- a/lib/libc/arch/m88k/sys/brk.S
+++ b/lib/libc/arch/m88k/sys/brk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brk.S,v 1.4 2003/01/02 20:25:31 miod Exp $	*/
+/*	$OpenBSD: brk.S,v 1.5 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)brk.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: brk.S,v 1.4 2003/01/02 20:25:31 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: brk.S,v 1.5 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -60,7 +58,7 @@ ENTRY(brk)
 	ld	r5,r5,lo16(minbrk)
 	cmp	r3,r5,r2
 	bb1	le,r3,1f	/* r2 should be > minbrk; can't go below end */
-	or	r2,r5,0		/* otherwise, set r2 to minbrk */ 
+	or	r2,r5,0		/* otherwise, set r2 to minbrk */
 1:
 	or	r4,r2,0
 	or	r13,r0,SYS_break
@@ -70,4 +68,4 @@ ENTRY(brk)
 	st	r4,r5,lo16(__curbrk)
 	or	r2,r0,0		/* clear r2/r3 to indicate success */
 	jmp.n	r1
-	or	r3,r0,0
+	 or	r3,r0,0
diff --git a/lib/libc/arch/m88k/sys/cerror.S b/lib/libc/arch/m88k/sys/cerror.S
index dc8d30be02e..eb0d32bffec 100644
--- a/lib/libc/arch/m88k/sys/cerror.S
+++ b/lib/libc/arch/m88k/sys/cerror.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cerror.S,v 1.3 2003/01/02 20:25:31 miod Exp $	*/
+/*	$OpenBSD: cerror.S,v 1.4 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)cerror.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: cerror.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: cerror.S,v 1.4 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -53,4 +51,4 @@ __cerror:
 	st	r2,r4,lo16(_errno)
 	sub	r2,r0,0x1
 	jmp.n	r1
-	sub	r3,r0,0x1
+	 sub	r3,r0,0x1
diff --git a/lib/libc/arch/m88k/sys/exect.S b/lib/libc/arch/m88k/sys/exect.S
index be6a2a04deb..3a375542848 100644
--- a/lib/libc/arch/m88k/sys/exect.S
+++ b/lib/libc/arch/m88k/sys/exect.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exect.S,v 1.3 2003/01/02 20:25:31 miod Exp $	*/
+/*	$OpenBSD: exect.S,v 1.4 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)exect.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: exect.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: exect.S,v 1.4 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/m88k/sys/fork.S b/lib/libc/arch/m88k/sys/fork.S
index f4051e5bae9..733322f8764 100644
--- a/lib/libc/arch/m88k/sys/fork.S
+++ b/lib/libc/arch/m88k/sys/fork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fork.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: fork.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)fork.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: fork.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: fork.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/m88k/sys/reboot.S b/lib/libc/arch/m88k/sys/reboot.S
index 0dbdd28f98f..6653738a533 100644
--- a/lib/libc/arch/m88k/sys/reboot.S
+++ b/lib/libc/arch/m88k/sys/reboot.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reboot.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: reboot.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,15 +37,13 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)reboot.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: reboot.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: reboot.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
 SYSCALL(reboot)
-	or	r9,r0,0x63
+	or	r9,r0,0x63	/* MVMEPROM_EXIT */
 	tb0	0,r0,496	/* call bug trap */
diff --git a/lib/libc/arch/m88k/sys/rfork.S b/lib/libc/arch/m88k/sys/rfork.S
index e4ff61c4160..6c2dcb9d4f5 100644
--- a/lib/libc/arch/m88k/sys/rfork.S
+++ b/lib/libc/arch/m88k/sys/rfork.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfork.S,v 1.1 2002/02/17 23:40:57 deraadt Exp $	*/
+/*	$OpenBSD: rfork.S,v 1.2 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)rfork.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: rfork.S,v 1.1 2002/02/17 23:40:57 deraadt Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: rfork.S,v 1.2 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/m88k/sys/sbrk.S b/lib/libc/arch/m88k/sys/sbrk.S
index f912e8648be..151e69223ac 100644
--- a/lib/libc/arch/m88k/sys/sbrk.S
+++ b/lib/libc/arch/m88k/sys/sbrk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbrk.S,v 1.4 2003/01/02 20:25:31 miod Exp $	*/
+/*	$OpenBSD: sbrk.S,v 1.5 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)sbrk.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: sbrk.S,v 1.4 2003/01/02 20:25:31 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: sbrk.S,v 1.5 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -71,4 +69,4 @@ ENTRY(sbrk)
 	/* and return old __curbrk */
 	or	r2,r3,0
 	jmp.n	r1
-	or	r3,r0,0
+	 or	r3,r0,0
diff --git a/lib/libc/arch/m88k/sys/setlogin.S b/lib/libc/arch/m88k/sys/setlogin.S
index 4aef4b47cb1..2c52c24ccf9 100644
--- a/lib/libc/arch/m88k/sys/setlogin.S
+++ b/lib/libc/arch/m88k/sys/setlogin.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setlogin.S,v 1.2 2000/03/01 17:31:21 todd Exp $	*/
+/*	$OpenBSD: setlogin.S,v 1.3 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -33,12 +33,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)setlogin.s	5.1 (Berkeley) 5/6/91"*/
-	.asciz "$OpenBSD: setlogin.S,v 1.2 2000/03/01 17:31:21 todd Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: setlogin.S,v 1.3 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/m88k/sys/sigpending.S b/lib/libc/arch/m88k/sys/sigpending.S
index 76265669f17..8569ba2cf54 100644
--- a/lib/libc/arch/m88k/sys/sigpending.S
+++ b/lib/libc/arch/m88k/sys/sigpending.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigpending.S,v 1.3 2003/01/02 20:25:31 miod Exp $	*/
+/*	$OpenBSD: sigpending.S,v 1.4 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)sigpending.s	5.2 (Berkeley) 8/6/90"*/
-	.asciz "$OpenBSD: sigpending.S,v 1.3 2003/01/02 20:25:31 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: sigpending.S,v 1.4 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -53,4 +51,4 @@ ENTRY(sigpending)
 	br	__cerror
 	st	r2,r4,0
 	jmp.n	r1
-	or	r2,r0,0
+	 or	r2,r0,0
diff --git a/lib/libc/arch/m88k/sys/sigprocmask.S b/lib/libc/arch/m88k/sys/sigprocmask.S
index a1cb4c4608d..777a1ac66b8 100644
--- a/lib/libc/arch/m88k/sys/sigprocmask.S
+++ b/lib/libc/arch/m88k/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigprocmask.S,v 1.4 2003/01/02 21:40:46 miod Exp $	*/
+/*	$OpenBSD: sigprocmask.S,v 1.5 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,27 +37,25 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)sigprocmask.s	5.2 (Berkeley) 6/6/90"*/
-	.asciz "$OpenBSD: sigprocmask.S,v 1.4 2003/01/02 21:40:46 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: sigprocmask.S,v 1.5 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
 SYSENTRY(sigprocmask)
-	bcnd	ne0,r3,L1		/* if new sigset pointer is null */
+	bcnd	ne0,r3,1f		/* if new sigset pointer is null */
 	or	r2,r0,1			/* how = SIG_BLOCK and do it */
-	br	L2
-L1:
+	br	2f
+1:
 	ld	r3,r3,0			/* else load set from *set and do it */
-L2:
+2:
 	or	r13,r0,SYS_sigprocmask
 	tb0	0,r0,128
 	br	__cerror
-	bcnd	eq0,r4,out		/* if old mask not requested, done */
+	bcnd	eq0,r4,3f		/* if old mask not requested, done */
 	st	r2,r4,0			/* otherwise, set it */
-out:
+3:
 	jmp.n	r1
-	or	r2,r0,0
+	 or	r2,r0,0
diff --git a/lib/libc/arch/m88k/sys/sigreturn.S b/lib/libc/arch/m88k/sys/sigreturn.S
index 88aa80b05cf..b4ccad079a6 100644
--- a/lib/libc/arch/m88k/sys/sigreturn.S
+++ b/lib/libc/arch/m88k/sys/sigreturn.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigreturn.S,v 1.3 2003/01/02 21:40:46 miod Exp $	*/
+/*	$OpenBSD: sigreturn.S,v 1.4 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)sigreturn.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 2003/01/02 21:40:46 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: sigreturn.S,v 1.4 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -52,3 +50,4 @@
  */
 
 SYSENTRY(sigreturn)
+	jmp	r1	/* XXX gross */
diff --git a/lib/libc/arch/m88k/sys/sigsuspend.S b/lib/libc/arch/m88k/sys/sigsuspend.S
index 77916849c2a..f9ecec61330 100644
--- a/lib/libc/arch/m88k/sys/sigsuspend.S
+++ b/lib/libc/arch/m88k/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sigsuspend.S,v 1.4 2003/01/02 21:40:46 miod Exp $	*/
+/*	$OpenBSD: sigsuspend.S,v 1.5 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)sigsuspend.s	5.2 (Berkeley) 6/6/90"*/
-	.asciz "$OpenBSD: sigsuspend.S,v 1.4 2003/01/02 21:40:46 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: sigsuspend.S,v 1.5 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"
 
@@ -59,4 +57,4 @@ SYSENTRY(sigsuspend)
 	tb0	0,r0,128
 	br	__cerror
 	jmp.n	r1
-	or	r2,r0,0
+	 or	r2,r0,0
diff --git a/lib/libc/arch/m88k/sys/syscall.S b/lib/libc/arch/m88k/sys/syscall.S
index 83021764886..143371947c7 100644
--- a/lib/libc/arch/m88k/sys/syscall.S
+++ b/lib/libc/arch/m88k/sys/syscall.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.S,v 1.4 2003/01/02 21:40:46 miod Exp $	*/
+/*	$OpenBSD: syscall.S,v 1.5 2003/01/07 22:01:35 miod Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -37,12 +37,10 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined(LIBC_SCCS)
 	.data
-	/*.asciz "from: @(#)syscall.s	5.1 (Berkeley) 5/12/90"*/
-	.asciz "$OpenBSD: syscall.S,v 1.4 2003/01/02 21:40:46 miod Exp $"
-	.text
-#endif /* LIBC_SCCS and not lint */
+	.string "$OpenBSD: syscall.S,v 1.5 2003/01/07 22:01:35 miod Exp $"
+#endif /* LIBC_SCCS */
 
 #include "SYS.h"