zap rcsid, tested there. okay deraadt@

52 files changed, 51 insertions, 259 deletions

diff --git a/lib/libc/arch/i386/gen/_setjmp.S b/lib/libc/arch/i386/gen/_setjmp.S
index 410360c2eb8..ac62635fd26 100644
--- a/lib/libc/arch/i386/gen/_setjmp.S
+++ b/lib/libc/arch/i386/gen/_setjmp.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: _setjmp.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: _setjmp.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 /*
  * C library -- _setjmp, _longjmp
  *
diff --git a/lib/libc/arch/i386/gen/alloca.S b/lib/libc/arch/i386/gen/alloca.S
index 8db1fa5a3f2..28af9eb12f1 100644
--- a/lib/libc/arch/i386/gen/alloca.S
+++ b/lib/libc/arch/i386/gen/alloca.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: alloca.S,v 1.6 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: alloca.S,v 1.5 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 /* like alloc, but automatic automatic free in return */
 
 ENTRY(alloca)
diff --git a/lib/libc/arch/i386/gen/divsi3.S b/lib/libc/arch/i386/gen/divsi3.S
index ee2c6aba9c1..9290415bbd3 100644
--- a/lib/libc/arch/i386/gen/divsi3.S
+++ b/lib/libc/arch/i386/gen/divsi3.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: divsi3.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: divsi3.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(__divsi3)
 	movl 4(%esp),%eax
 	cltd
diff --git a/lib/libc/arch/i386/gen/fabs.S b/lib/libc/arch/i386/gen/fabs.S
index bbee413b1e4..7d1bbe8fb76 100644
--- a/lib/libc/arch/i386/gen/fabs.S
+++ b/lib/libc/arch/i386/gen/fabs.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fabs.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fabs.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(fabs)
 	fldl	4(%esp)
 	fabs
diff --git a/lib/libc/arch/i386/gen/fixdfsi.S b/lib/libc/arch/i386/gen/fixdfsi.S
index 0c790b8c1aa..e6a90fdfcfc 100644
--- a/lib/libc/arch/i386/gen/fixdfsi.S
+++ b/lib/libc/arch/i386/gen/fixdfsi.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixdfsi.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fixdfsi.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(__fixdfsi)
 	fldl	4(%esp)
 	fistpl	4(%esp)
diff --git a/lib/libc/arch/i386/gen/fixunsdfsi.S b/lib/libc/arch/i386/gen/fixunsdfsi.S
index 8f06010f8e1..f353d0a0d7b 100644
--- a/lib/libc/arch/i386/gen/fixunsdfsi.S
+++ b/lib/libc/arch/i386/gen/fixunsdfsi.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fixunsdfsi.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fixunsdfsi.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(__fixunsdfsi)
 	fldl	4(%esp)		/* argument double to accum stack */
 	frndint			/* create integer */
diff --git a/lib/libc/arch/i386/gen/flt_rounds.S b/lib/libc/arch/i386/gen/flt_rounds.S
index 7bb1030bfd3..f50fc88a277 100644
--- a/lib/libc/arch/i386/gen/flt_rounds.S
+++ b/lib/libc/arch/i386/gen/flt_rounds.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: flt_rounds.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin, Apr 4, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: flt_rounds.S,v 1.2 1996/08/19 08:12:20 tholo Exp $"
-#endif
-
 	.text
 	.align 2
 _map:
diff --git a/lib/libc/arch/i386/gen/fpgetmask.S b/lib/libc/arch/i386/gen/fpgetmask.S
index 6a14fc72d1b..b08eecadf75 100644
--- a/lib/libc/arch/i386/gen/fpgetmask.S
+++ b/lib/libc/arch/i386/gen/fpgetmask.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpgetmask.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin, Apr 4, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpgetmask.S,v 1.2 1996/08/19 08:12:22 tholo Exp $"
-#endif
-
 ENTRY(fpgetmask)
 	subl $4,%esp
 	fnstcw (%esp)
diff --git a/lib/libc/arch/i386/gen/fpgetround.S b/lib/libc/arch/i386/gen/fpgetround.S
index 0d70d4806d7..8acabd19d33 100644
--- a/lib/libc/arch/i386/gen/fpgetround.S
+++ b/lib/libc/arch/i386/gen/fpgetround.S
@@ -1,3 +1,4 @@
+/* $OpeNBSD$ */
 /*
  * Written by J.T. Conklin, Apr 4, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpgetround.S,v 1.2 1996/08/19 08:12:23 tholo Exp $"
-#endif
-
 ENTRY(fpgetround)
 	subl $4,%esp
 	fnstcw (%esp)
diff --git a/lib/libc/arch/i386/gen/fpgetsticky.S b/lib/libc/arch/i386/gen/fpgetsticky.S
index f824b8d7b38..1e81e4cd8a3 100644
--- a/lib/libc/arch/i386/gen/fpgetsticky.S
+++ b/lib/libc/arch/i386/gen/fpgetsticky.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpgetsticky.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin, Apr 4, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpgetsticky.S,v 1.2 1996/08/19 08:12:24 tholo Exp $"
-#endif
-
 ENTRY(fpgetsticky)
 	subl $4,%esp
 	fnstsw (%esp)
diff --git a/lib/libc/arch/i386/gen/fpsetmask.S b/lib/libc/arch/i386/gen/fpsetmask.S
index a9d96c9b760..1b47e8c3697 100644
--- a/lib/libc/arch/i386/gen/fpsetmask.S
+++ b/lib/libc/arch/i386/gen/fpsetmask.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpsetmask.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpsetmask.S,v 1.2 1996/08/19 08:12:25 tholo Exp $"
-#endif
-
 ENTRY(fpsetmask)
 	subl $4,%esp
 
diff --git a/lib/libc/arch/i386/gen/fpsetround.S b/lib/libc/arch/i386/gen/fpsetround.S
index efb2db34a27..c80978b974e 100644
--- a/lib/libc/arch/i386/gen/fpsetround.S
+++ b/lib/libc/arch/i386/gen/fpsetround.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpsetround.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpsetround.S,v 1.2 1996/08/19 08:12:26 tholo Exp $"
-#endif
-
 ENTRY(fpsetround)
 	subl $4,%esp
 
diff --git a/lib/libc/arch/i386/gen/fpsetsticky.S b/lib/libc/arch/i386/gen/fpsetsticky.S
index e3c20cc536b..6a67645142d 100644
--- a/lib/libc/arch/i386/gen/fpsetsticky.S
+++ b/lib/libc/arch/i386/gen/fpsetsticky.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: fpsetsticky.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by Charles M. Hannum, Apr 9, 1995
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fpsetsticky.S,v 1.2 1996/08/19 08:12:28 tholo Exp $"
-#endif
-
 ENTRY(fpsetsticky)
 	subl $28,%esp
 
diff --git a/lib/libc/arch/i386/gen/infinity.c b/lib/libc/arch/i386/gen/infinity.c
index 839cd034c82..733a2a094b1 100644
--- a/lib/libc/arch/i386/gen/infinity.c
+++ b/lib/libc/arch/i386/gen/infinity.c
@@ -1,7 +1,4 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: infinity.c,v 1.3 1996/09/15 09:30:42 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
+/*	$OpenBSD: infinity.c,v 1.4 2005/08/07 11:30:38 espie Exp $ */
 /* infinity.c */
 
 #include <math.h>
diff --git a/lib/libc/arch/i386/gen/isinf.c b/lib/libc/arch/i386/gen/isinf.c
index 981d5b47569..a01c1f918fa 100644
--- a/lib/libc/arch/i386/gen/isinf.c
+++ b/lib/libc/arch/i386/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.6 2003/06/25 21:15:04 deraadt Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.7 2005/08/07 11:30:38 espie Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -33,10 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isinf.c,v 1.6 2003/06/25 21:15:04 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <math.h>
diff --git a/lib/libc/arch/i386/gen/isnan.c b/lib/libc/arch/i386/gen/isnan.c
index 07c73c8edd4..0f8ce1c8ab4 100644
--- a/lib/libc/arch/i386/gen/isnan.c
+++ b/lib/libc/arch/i386/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.3 2003/06/25 21:15:04 deraadt Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.4 2005/08/07 11:30:38 espie Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -33,10 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isnan.c,v 1.3 2003/06/25 21:15:04 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <math.h>
diff --git a/lib/libc/arch/i386/gen/ldexp.c b/lib/libc/arch/i386/gen/ldexp.c
index 91aae3610cb..d6f063104bc 100644
--- a/lib/libc/arch/i386/gen/ldexp.c
+++ b/lib/libc/arch/i386/gen/ldexp.c
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ldexp.c,v 1.5 2003/07/15 17:32:41 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <math.h>
 
 /*
diff --git a/lib/libc/arch/i386/gen/modf.S b/lib/libc/arch/i386/gen/modf.S
index af42cf5f637..2d4c5151477 100644
--- a/lib/libc/arch/i386/gen/modf.S
+++ b/lib/libc/arch/i386/gen/modf.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: modf.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: modf.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 /*
  * modf(value, iptr): return fractional part of value, and stores the
  * integral part into iptr (a pointer to double).
diff --git a/lib/libc/arch/i386/gen/setjmp.S b/lib/libc/arch/i386/gen/setjmp.S
index 38347de60dc..bcb5f9d5e5d 100644
--- a/lib/libc/arch/i386/gen/setjmp.S
+++ b/lib/libc/arch/i386/gen/setjmp.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: setjmp.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: setjmp.S,v 1.7 2005/04/01 08:08:15 hshoexer Exp $"
-#endif
-
 /*
  * C library -- setjmp, longjmp
  *
diff --git a/lib/libc/arch/i386/gen/sigsetjmp.S b/lib/libc/arch/i386/gen/sigsetjmp.S
index c45de476c5c..c990a0582a5 100644
--- a/lib/libc/arch/i386/gen/sigsetjmp.S
+++ b/lib/libc/arch/i386/gen/sigsetjmp.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: sigsetjmp.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsetjmp.S,v 1.6 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(sigsetjmp)
 	movl	4(%esp),%ecx
 	movl	8(%esp),%eax
diff --git a/lib/libc/arch/i386/gen/udivsi3.S b/lib/libc/arch/i386/gen/udivsi3.S
index 94e1be6e87c..452975df84d 100644
--- a/lib/libc/arch/i386/gen/udivsi3.S
+++ b/lib/libc/arch/i386/gen/udivsi3.S
@@ -1,3 +1,4 @@
+/* $OpenBSD: udivsi3.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: udivsi3.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 ENTRY(__udivsi3)
 	movl 4(%esp),%eax
 	xorl %edx,%edx
diff --git a/lib/libc/arch/i386/string/bcmp.S b/lib/libc/arch/i386/string/bcmp.S
index 2b86c73ec99..a5b46ae745a 100644
--- a/lib/libc/arch/i386/string/bcmp.S
+++ b/lib/libc/arch/i386/string/bcmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bcmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: bcmp.S,v 1.2 1996/08/19 08:12:52 tholo Exp $"
-#endif
-
 ENTRY(bcmp)
 	pushl	%edi
 	pushl	%esi
diff --git a/lib/libc/arch/i386/string/bcopy.S b/lib/libc/arch/i386/string/bcopy.S
index af9c86c1155..dde5ae111f4 100644
--- a/lib/libc/arch/i386/string/bcopy.S
+++ b/lib/libc/arch/i386/string/bcopy.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcopy.S,v 1.4 2003/06/02 20:18:30 millert Exp $	*/
+/*	$OpenBSD: bcopy.S,v 1.5 2005/08/07 11:30:38 espie Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -33,11 +33,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: bcopy.S,v 1.4 2003/06/02 20:18:30 millert Exp $"
-#endif
-
 	/*
 	 * (ov)bcopy (src,dst,cnt)
 	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
diff --git a/lib/libc/arch/i386/string/bzero.S b/lib/libc/arch/i386/string/bzero.S
index ba40ffa345a..2ec9c7dd6c6 100644
--- a/lib/libc/arch/i386/string/bzero.S
+++ b/lib/libc/arch/i386/string/bzero.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: bzero.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: bzero.S,v 1.2 1996/08/19 08:12:56 tholo Exp $"
-#endif
-
 ENTRY(bzero)
 	pushl	%edi
 	movl	8(%esp),%edi
diff --git a/lib/libc/arch/i386/string/ffs.S b/lib/libc/arch/i386/string/ffs.S
index e6b11dbb165..96affabed07 100644
--- a/lib/libc/arch/i386/string/ffs.S
+++ b/lib/libc/arch/i386/string/ffs.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ffs.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: ffs.S,v 1.2 1996/08/19 08:12:58 tholo Exp $"
-#endif
-
 ENTRY(ffs)
 	bsfl	4(%esp),%eax
 	jz	L1	 		/* ZF is set if all bits are 0 */
diff --git a/lib/libc/arch/i386/string/index.S b/lib/libc/arch/i386/string/index.S
index 362f6f4da20..7f83ef5b114 100644
--- a/lib/libc/arch/i386/string/index.S
+++ b/lib/libc/arch/i386/string/index.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: index.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: index.S,v 1.3 2000/12/29 17:34:55 mickey Exp $"
-#endif
-
 #ifdef STRCHR
 ENTRY(strchr)
 #else
diff --git a/lib/libc/arch/i386/string/memchr.S b/lib/libc/arch/i386/string/memchr.S
index 583b0e1748d..d6bcbe688b5 100644
--- a/lib/libc/arch/i386/string/memchr.S
+++ b/lib/libc/arch/i386/string/memchr.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: memchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: memchr.S,v 1.2 1996/08/19 08:13:01 tholo Exp $"
-#endif
-
 ENTRY(memchr)
 	pushl	%edi
 	movl	8(%esp),%edi		/* string address */
diff --git a/lib/libc/arch/i386/string/memcmp.S b/lib/libc/arch/i386/string/memcmp.S
index fdd49c948ce..1be189aefbb 100644
--- a/lib/libc/arch/i386/string/memcmp.S
+++ b/lib/libc/arch/i386/string/memcmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: memcmp.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: memcmp.S,v 1.3 1997/07/23 20:55:21 kstailey Exp $"
-#endif
-
 ENTRY(memcmp)
 	pushl	%edi
 	pushl	%esi
diff --git a/lib/libc/arch/i386/string/memcpy.S b/lib/libc/arch/i386/string/memcpy.S
index 7b993ad3a40..95c8a838b95 100644
--- a/lib/libc/arch/i386/string/memcpy.S
+++ b/lib/libc/arch/i386/string/memcpy.S
@@ -1,7 +1,3 @@
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: memcpy.S,v 1.2 1996/08/19 08:13:05 tholo Exp $"
-#endif
-
+/*	$OpenBSD: memcpy.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/arch/i386/string/memmove.S b/lib/libc/arch/i386/string/memmove.S
index a0a2a16c390..c5bfd19b1d0 100644
--- a/lib/libc/arch/i386/string/memmove.S
+++ b/lib/libc/arch/i386/string/memmove.S
@@ -1,7 +1,3 @@
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: memmove.S,v 1.2 1996/08/19 08:13:07 tholo Exp $"
-#endif
-
+/*	$OpenBSD: memmove.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/arch/i386/string/memset.S b/lib/libc/arch/i386/string/memset.S
index 4598cf00b43..1059ccc9951 100644
--- a/lib/libc/arch/i386/string/memset.S
+++ b/lib/libc/arch/i386/string/memset.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: memset.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: memset.S,v 1.2 1996/08/19 08:13:09 tholo Exp $"
-#endif
-
 ENTRY(memset)
 	pushl	%edi
 	pushl	%ebx
diff --git a/lib/libc/arch/i386/string/rindex.S b/lib/libc/arch/i386/string/rindex.S
index 3c17893c5a2..0260d384ce2 100644
--- a/lib/libc/arch/i386/string/rindex.S
+++ b/lib/libc/arch/i386/string/rindex.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rindex.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: rindex.S,v 1.2 1996/08/19 08:13:10 tholo Exp $"
-#endif
-
 #ifdef STRRCHR
 ENTRY(strrchr)
 #else
diff --git a/lib/libc/arch/i386/string/strcat.S b/lib/libc/arch/i386/string/strcat.S
index 96b8393608e..60fdd554ee0 100644
--- a/lib/libc/arch/i386/string/strcat.S
+++ b/lib/libc/arch/i386/string/strcat.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strcat.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -12,11 +13,6 @@
 #NO_APP
 #endif
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strcat.S,v 1.7 2005/03/25 22:22:30 kettenis Exp $"
-#endif
-
 /*
  * NOTE: I've unrolled the loop eight times: large enough to make a
  * significant difference, and small enough not to totally trash the
diff --git a/lib/libc/arch/i386/string/strchr.S b/lib/libc/arch/i386/string/strchr.S
index ef3597ebce2..f76e593fcd0 100644
--- a/lib/libc/arch/i386/string/strchr.S
+++ b/lib/libc/arch/i386/string/strchr.S
@@ -1,7 +1,3 @@
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strchr.S,v 1.2 1996/08/19 08:13:14 tholo Exp $"
-#endif
-
+/*	$OpenBSD: strchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 #define STRCHR
 #include "index.S"
diff --git a/lib/libc/arch/i386/string/strcmp.S b/lib/libc/arch/i386/string/strcmp.S
index d4d6500ab56..22ba5460eae 100644
--- a/lib/libc/arch/i386/string/strcmp.S
+++ b/lib/libc/arch/i386/string/strcmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strcmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strcmp.S,v 1.2 1996/08/19 08:13:15 tholo Exp $"
-#endif
-
 /*
  * NOTE: I've unrolled the loop eight times: large enough to make a
  * significant difference, and small enough not to totally trash the
diff --git a/lib/libc/arch/i386/string/strcpy.S b/lib/libc/arch/i386/string/strcpy.S
index 630aff72314..341eb6c39a9 100644
--- a/lib/libc/arch/i386/string/strcpy.S
+++ b/lib/libc/arch/i386/string/strcpy.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strcpy.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -12,11 +13,6 @@
 #NO_APP
 #endif
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strcpy.S,v 1.7 2005/03/25 22:22:30 kettenis Exp $"
-#endif
-
 /*
  * NOTE: I've unrolled the loop eight times: large enough to make a
  * significant difference, and small enough not to totally trash the
diff --git a/lib/libc/arch/i386/string/strlen.S b/lib/libc/arch/i386/string/strlen.S
index 563b4046bba..4f04ffc995d 100644
--- a/lib/libc/arch/i386/string/strlen.S
+++ b/lib/libc/arch/i386/string/strlen.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strlen.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strlen.S,v 1.2 1996/08/19 08:13:19 tholo Exp $"
-#endif
-
 ENTRY(strlen)
 	pushl	%edi
 	movl	8(%esp),%edi		/* string address */
diff --git a/lib/libc/arch/i386/string/strncmp.S b/lib/libc/arch/i386/string/strncmp.S
index 0eaad0af0f7..5aa88d7e798 100644
--- a/lib/libc/arch/i386/string/strncmp.S
+++ b/lib/libc/arch/i386/string/strncmp.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: strncmp.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strncmp.S,v 1.2 1996/08/19 08:13:21 tholo Exp $"
-#endif
-
 /*
  * NOTE: I've unrolled the loop eight times: large enough to make a
  * significant difference, and small enough not to totally trash the
diff --git a/lib/libc/arch/i386/string/strrchr.S b/lib/libc/arch/i386/string/strrchr.S
index 0bcb6a99dcf..4ee153ff55f 100644
--- a/lib/libc/arch/i386/string/strrchr.S
+++ b/lib/libc/arch/i386/string/strrchr.S
@@ -1,7 +1,3 @@
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: strrchr.S,v 1.2 1996/08/19 08:13:22 tholo Exp $"
-#endif
-
+/*	$OpenBSD: strrchr.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 #define STRRCHR
 #include "rindex.S"
diff --git a/lib/libc/arch/i386/string/swab.S b/lib/libc/arch/i386/string/swab.S
index def72f126f3..305586023da 100644
--- a/lib/libc/arch/i386/string/swab.S
+++ b/lib/libc/arch/i386/string/swab.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: swab.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
@@ -5,11 +6,6 @@
 
 #include <machine/asm.h>
 
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: swab.S,v 1.2 1996/08/19 08:13:24 tholo Exp $"
-#endif
-
 /*
  * On the i486, this code is negligibly faster than the code generated
  * by gcc at about half the size.  If my i386 databook is correct, it
diff --git a/lib/libc/arch/i386/sys/Ovfork.S b/lib/libc/arch/i386/sys/Ovfork.S
index 428e9228447..c4f64416cae 100644
--- a/lib/libc/arch/i386/sys/Ovfork.S
+++ b/lib/libc/arch/i386/sys/Ovfork.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: Ovfork.S,v 1.6 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: Ovfork.S,v 1.5 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIB_SCCS */
-
 /*
  * pid = vfork();
  *
diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S
index 3ab8de24b10..acae4399514 100644
--- a/lib/libc/arch/i386/sys/brk.S
+++ b/lib/libc/arch/i386/sys/brk.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: brk.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: brk.S,v 1.7 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIB_SCCS */
-
 	.globl	_end
 	.globl	minbrk
 	.globl	__curbrk
diff --git a/lib/libc/arch/i386/sys/cerror.S b/lib/libc/arch/i386/sys/cerror.S
index e0fdb66c295..5033c2f41ce 100644
--- a/lib/libc/arch/i386/sys/cerror.S
+++ b/lib/libc/arch/i386/sys/cerror.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cerror.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: cerror.S,v 1.6 2004/06/21 21:22:05 drahn Exp $"
-#endif /* SYSLIB_SCCS */
-
 	.globl	_C_LABEL(errno)
 _ENTRY(CERROR)
 #ifdef PIC
diff --git a/lib/libc/arch/i386/sys/exect.S b/lib/libc/arch/i386/sys/exect.S
index 8ef9911f41d..363f3003f6e 100644
--- a/lib/libc/arch/i386/sys/exect.S
+++ b/lib/libc/arch/i386/sys/exect.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: exect.S,v 1.6 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -33,11 +34,6 @@
 #include "SYS.h"
 #include <machine/psl.h>
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: exect.S,v 1.5 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIB_SCCS */
-
 ENTRY(exect)
 	movl	$(SYS_execve),%eax
 	pushf
diff --git a/lib/libc/arch/i386/sys/fork.S b/lib/libc/arch/i386/sys/fork.S
index 846cae19390..e8850dd5b5c 100644
--- a/lib/libc/arch/i386/sys/fork.S
+++ b/lib/libc/arch/i386/sys/fork.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: fork.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fork.S,v 1.3 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIB_SCCS */
-
 SYSCALL(fork)
 	decl	%edx	/* from 1 to 0 in child, 0 to -1 in parent */
 	andl	%edx,%eax
diff --git a/lib/libc/arch/i386/sys/rfork.S b/lib/libc/arch/i386/sys/rfork.S
index 8b8cf93b306..6ef6875208a 100644
--- a/lib/libc/arch/i386/sys/rfork.S
+++ b/lib/libc/arch/i386/sys/rfork.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: rfork.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: rfork.S,v 1.2 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIB_SCCS */
-
 SYSCALL(rfork)
 	decl	%edx	/* from 1 to 0 in child, 0 to -1 in parent */
 	andl	%edx,%eax
diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S
index 57d2ec8d04e..9d97e2c383e 100644
--- a/lib/libc/arch/i386/sys/sbrk.S
+++ b/lib/libc/arch/i386/sys/sbrk.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sbrk.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sbrk.S,v 1.7 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIBC_SCCS */
-
 	.globl	_end
 	.globl	__curbrk
 
diff --git a/lib/libc/arch/i386/sys/sigpending.S b/lib/libc/arch/i386/sys/sigpending.S
index a3b2dd15b64..89317d8f791 100644
--- a/lib/libc/arch/i386/sys/sigpending.S
+++ b/lib/libc/arch/i386/sys/sigpending.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigpending.S,v 1.4 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigpending.S,v 1.3 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIBC_SCCS */
-
 SYSCALL(sigpending)
 	movl	4(%esp),%ecx		# fetch pointer to...
 	movl	%eax,(%ecx)		# store old mask
diff --git a/lib/libc/arch/i386/sys/sigprocmask.S b/lib/libc/arch/i386/sys/sigprocmask.S
index ebbd2e217be..b0265042086 100644
--- a/lib/libc/arch/i386/sys/sigprocmask.S
+++ b/lib/libc/arch/i386/sys/sigprocmask.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigprocmask.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigprocmask.S,v 1.7 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIBC_SCCS */
-
 SYSENTRY(sigprocmask)
 	movl	8(%esp),%ecx		# fetch new sigset pointer
 	testl	%ecx,%ecx		# check new sigset pointer
diff --git a/lib/libc/arch/i386/sys/sigreturn.S b/lib/libc/arch/i386/sys/sigreturn.S
index a82b0e829ec..897edac6b62 100644
--- a/lib/libc/arch/i386/sys/sigreturn.S
+++ b/lib/libc/arch/i386/sys/sigreturn.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigreturn.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.6 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIBC_SCCS */
-
 /*
  * We must preserve the state of the registers as the user has set them up.
  */
diff --git a/lib/libc/arch/i386/sys/sigsuspend.S b/lib/libc/arch/i386/sys/sigsuspend.S
index 92303dcd3a3..c14858224cd 100644
--- a/lib/libc/arch/i386/sys/sigsuspend.S
+++ b/lib/libc/arch/i386/sys/sigsuspend.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: sigsuspend.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsuspend.S,v 1.6 2003/06/02 20:18:30 millert Exp $"
-#endif /* SYSLIBC_SCCS */
-
 SYSENTRY(sigsuspend)
 	movl	4(%esp),%eax		# fetch mask arg
 	movl	(%eax),%eax		# indirect to mask arg
diff --git a/lib/libc/arch/i386/sys/syscall.S b/lib/libc/arch/i386/sys/syscall.S
index d7349ecc029..aa86e1c763d 100644
--- a/lib/libc/arch/i386/sys/syscall.S
+++ b/lib/libc/arch/i386/sys/syscall.S
@@ -1,3 +1,4 @@
+/*	$OpenBSD: syscall.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,11 +33,6 @@
 
 #include "SYS.h"
 
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: syscall.S,v 1.7 2004/10/29 21:14:16 hshoexer Exp $"
-#endif /* SYSLIBC_SCCS */
-
 SYSENTRY(syscall)
 	pop	%ecx	/* rta */
 	pop	%eax	/* syscall number */