26 files changed, 36 insertions, 121 deletions

diff --git a/lib/libc/i386/gen/_ctx_start.S b/lib/libc/i386/gen/_ctx_start.S
index 593a57060e6a..bfff53a0a3d4 100644
--- a/lib/libc/i386/gen/_ctx_start.S
+++ b/lib/libc/i386/gen/_ctx_start.S
@@ -24,11 +24,8 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * _ctx_start((void *func)(int arg1, ..., argn),
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
index 52e32261f998..88643d0867bb 100644
--- a/lib/libc/i386/gen/alloca.S
+++ b/lib/libc/i386/gen/alloca.S
@@ -37,19 +37,11 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.asciz "@(#)alloca.s	5.2 (Berkeley) 5/14/90"
 #endif /* LIBC_SCCS and not lint */
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#ifdef __ELF__
-	.ident "$FreeBSD$"
-#else
-	.data
-	.asciz "$FreeBSD$"
-	.previous
-#endif
-#endif
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
-/* like alloc, but automatic automatic free in return */
 
-#include <machine/asm.h>
+/* like alloc, but automatic automatic free in return */
 
 ENTRY(alloca)
 	popl	%edx		/*  pop return addr */
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 0bce2ac5c95c..52784cf7b275 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -37,17 +37,8 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
 #endif /* LIBC_SCCS and not lint */
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#ifdef __ELF__
-	.ident "$FreeBSD$"
-#else
-	.data
-	.asciz "$FreeBSD$"
-	.previous
-#endif
-#endif
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(fabs)
 	fldl	4(%esp)
diff --git a/lib/libc/i386/gen/getcontext.S b/lib/libc/i386/gen/getcontext.S
index c3feb2a3bce9..9e799d56ae7c 100644
--- a/lib/libc/i386/gen/getcontext.S
+++ b/lib/libc/i386/gen/getcontext.S
@@ -24,11 +24,8 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Where do we define these?
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
index 9ce4a757307b..d01aebe47478 100644
--- a/lib/libc/i386/gen/rfork_thread.S
+++ b/lib/libc/i386/gen/rfork_thread.S
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * With thanks to John Dyson for the original version of this.
  */
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index efe973b036ca..5d7b25b6252b 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(div)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index 70b1b3e525af..f2d561454fef 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(ldiv)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index 1334ff1edd37..60ece4f70b73 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * bcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S
index d2a571ebb4c8..aaa701b82c0c 100644
--- a/lib/libc/i386/string/bcopy.S
+++ b/lib/libc/i386/string/bcopy.S
@@ -34,8 +34,11 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
+#if 0
 	RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
+#endif
 
 	/*
 	 * (ov)bcopy (src,dst,cnt)
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index 823ed1a69efc..da55365b9dc0 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * bzero (void *b, size_t len)
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index e2e6cba1fd86..7f3719c79b02 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * ffs(value)
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index c36e55a0a8e4..51e37b040ee8 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * index(s, c)
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index bbd03d1e40d6..8f7e8b5ea8c9 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * memchr (b, c, len)
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index 3a7d0f8e290f..8aa2f4ea0413 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * memcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/memcpy.S b/lib/libc/i386/string/memcpy.S
index 1617c7153aac..f85a1a5b8021 100644
--- a/lib/libc/i386/string/memcpy.S
+++ b/lib/libc/i386/string/memcpy.S
@@ -1,2 +1,5 @@
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S
index f5a94ed4937e..02330c44414b 100644
--- a/lib/libc/i386/string/memmove.S
+++ b/lib/libc/i386/string/memmove.S
@@ -1,2 +1,5 @@
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index 2dcba4302a69..52f0485e6368 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * memset(void *b, int c, size_t len)
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index c364ee2d471e..651a90b869a8 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * rindex(s, c)
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 9d2c65989bc3..51551475a409 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strcat(s, append)
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 682866b7a5b0..14ef17f435a8 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strchr(s, c)
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 045e95a865f4..0860fc9313b7 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strcmp(s1, s2)
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index b3bccc17abef..4d03aa21e1ed 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strcpy (dst, src)
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index 44fbdadcd833..2078013d3965 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strlen (s)
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index da075b9a762f..e5953c520482 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strncmp(s1, s2, n)
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index bef84d0d7a96..27cb894b19d9 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-        .asciz "$FreeBSD$"
-#endif /* LIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * strrchr(s, c)
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index ce2aff158586..11967f631217 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -28,12 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(LIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * void