28 files changed, 66 insertions, 42 deletions

diff --git a/lib/libc/alpha/gen/_ctx_start.S b/lib/libc/alpha/gen/_ctx_start.S
index f17d1d5aa3537..229a6c19bd163 100644
--- a/lib/libc/alpha/gen/_ctx_start.S
+++ b/lib/libc/alpha/gen/_ctx_start.S
@@ -24,12 +24,8 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- */
-
 #include <machine/asm.h>
-
+__FBSDID("$FreeBSD$");
 
 /*
  * A0-A5 are the first 6 arguments to the start routine with the
diff --git a/lib/libc/alpha/gen/_setjmp.S b/lib/libc/alpha/gen/_setjmp.S
index 22cba2aff7ceb..85ed8c7e0831f 100644
--- a/lib/libc/alpha/gen/_setjmp.S
+++ b/lib/libc/alpha/gen/_setjmp.S
@@ -25,11 +25,10 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * C library -- _setjmp, _longjmp
diff --git a/lib/libc/alpha/gen/fabs.S b/lib/libc/alpha/gen/fabs.S
index 4305cce8539f2..5a742fec5e7b0 100644
--- a/lib/libc/alpha/gen/fabs.S
+++ b/lib/libc/alpha/gen/fabs.S
@@ -1,5 +1,4 @@
 /*	$NetBSD: fabs.S,v 1.2 1996/10/17 03:08:05 cgd Exp $	*/
-/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,6 +28,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 LEAF(fabs, 1)
 	cpys	fzero, fa0, fv0
diff --git a/lib/libc/alpha/gen/getcontext.S b/lib/libc/alpha/gen/getcontext.S
index 92a15fd9b6ad9..81491337c578c 100644
--- a/lib/libc/alpha/gen/getcontext.S
+++ b/lib/libc/alpha/gen/getcontext.S
@@ -51,11 +51,8 @@
  *
  */
 
-/*
- * $FreeBSD$
- */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /* #include <machine/frame.h> */
 #define	FRAME_V0		0
diff --git a/lib/libc/alpha/gen/rfork_thread.S b/lib/libc/alpha/gen/rfork_thread.S
index ff0ed2c5acc2e..68b0233549bab 100644
--- a/lib/libc/alpha/gen/rfork_thread.S
+++ b/lib/libc/alpha/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$");
+
 #include "SYS.h"
 #include <sys/syscall.h>
 /* #include <machine/pal.h> */
diff --git a/lib/libc/alpha/gen/setjmp.S b/lib/libc/alpha/gen/setjmp.S
index 20e11352fb201..5e154f583bfa7 100644
--- a/lib/libc/alpha/gen/setjmp.S
+++ b/lib/libc/alpha/gen/setjmp.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/alpha/gen/sigsetjmp.S b/lib/libc/alpha/gen/sigsetjmp.S
index ddc0636894c55..0f7e4008f9a90 100644
--- a/lib/libc/alpha/gen/sigsetjmp.S
+++ b/lib/libc/alpha/gen/sigsetjmp.S
@@ -25,11 +25,10 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * C library -- sigsetjmp, siglongjmp
diff --git a/lib/libc/alpha/net/byte_swap_2.S b/lib/libc/alpha/net/byte_swap_2.S
index ebcbeda22f81e..d7933c4aebb2d 100644
--- a/lib/libc/alpha/net/byte_swap_2.S
+++ b/lib/libc/alpha/net/byte_swap_2.S
@@ -25,11 +25,10 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/alpha/net/byte_swap_4.S b/lib/libc/alpha/net/byte_swap_4.S
index ddfd1e9970c29..04acc85d3aed2 100644
--- a/lib/libc/alpha/net/byte_swap_4.S
+++ b/lib/libc/alpha/net/byte_swap_4.S
@@ -25,11 +25,10 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/alpha/net/htonl.S b/lib/libc/alpha/net/htonl.S
index 90d94415d58ee..05c906c1bbbf7 100644
--- a/lib/libc/alpha/net/htonl.S
+++ b/lib/libc/alpha/net/htonl.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	htonl
 #define	NAME	__htonl
 
diff --git a/lib/libc/alpha/net/htons.S b/lib/libc/alpha/net/htons.S
index 405d5378a23e6..4bd3a8b61b60b 100644
--- a/lib/libc/alpha/net/htons.S
+++ b/lib/libc/alpha/net/htons.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	htons
 #define	NAME	__htons
 
diff --git a/lib/libc/alpha/net/ntohl.S b/lib/libc/alpha/net/ntohl.S
index 54ea68dba613d..a08a1627e28e9 100644
--- a/lib/libc/alpha/net/ntohl.S
+++ b/lib/libc/alpha/net/ntohl.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	ntohl
 #define	NAME	__ntohl
 
diff --git a/lib/libc/alpha/net/ntohs.S b/lib/libc/alpha/net/ntohs.S
index f841a7a8b4a39..79e6e0c73d09d 100644
--- a/lib/libc/alpha/net/ntohs.S
+++ b/lib/libc/alpha/net/ntohs.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	ntohs
 #define	NAME	__ntohs
 
diff --git a/lib/libc/alpha/string/bcopy.S b/lib/libc/alpha/string/bcopy.S
index 6a45ad68306bc..dc230637fd160 100644
--- a/lib/libc/alpha/string/bcopy.S
+++ b/lib/libc/alpha/string/bcopy.S
@@ -29,6 +29,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if defined(MEMCOPY) || defined(MEMMOVE)
 #ifdef MEMCOPY
diff --git a/lib/libc/alpha/string/bzero.S b/lib/libc/alpha/string/bzero.S
index 9897344416c28..dd94200f5c028 100644
--- a/lib/libc/alpha/string/bzero.S
+++ b/lib/libc/alpha/string/bzero.S
@@ -28,6 +28,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 LEAF(bzero,2)
 	ble	a1,bzero_done
diff --git a/lib/libc/alpha/string/ffs.S b/lib/libc/alpha/string/ffs.S
index 4c30a164c276c..11147d6071358 100644
--- a/lib/libc/alpha/string/ffs.S
+++ b/lib/libc/alpha/string/ffs.S
@@ -32,6 +32,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 LEAF(ffs, 1)
 	addl	a0, 0, t0
diff --git a/lib/libc/alpha/string/memcpy.S b/lib/libc/alpha/string/memcpy.S
index 7f5527da3919e..ef50ab162905a 100644
--- a/lib/libc/alpha/string/memcpy.S
+++ b/lib/libc/alpha/string/memcpy.S
@@ -1,4 +1,8 @@
 /*	$NetBSD: memcpy.S,v 1.1 1995/08/13 00:40:47 cgd Exp $	*/
 
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define MEMCOPY
 #include "bcopy.S"
diff --git a/lib/libc/alpha/string/memmove.S b/lib/libc/alpha/string/memmove.S
index 4e632d2b4de0d..ad80b1cda1d3a 100644
--- a/lib/libc/alpha/string/memmove.S
+++ b/lib/libc/alpha/string/memmove.S
@@ -1,4 +1,7 @@
 /*	$NetBSD: memmove.S,v 1.1 1995/08/13 00:40:48 cgd Exp $	*/
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define MEMMOVE
 #include "bcopy.S"
diff --git a/lib/libc/alpha/sys/Ovfork.S b/lib/libc/alpha/sys/Ovfork.S
index 808a5a7a03d18..ca2bbefc3ea83 100644
--- a/lib/libc/alpha/sys/Ovfork.S
+++ b/lib/libc/alpha/sys/Ovfork.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 SYSCALL(vfork)
diff --git a/lib/libc/alpha/sys/brk.S b/lib/libc/alpha/sys/brk.S
index 7dc3a40af8d79..9f3385b7bc27b 100644
--- a/lib/libc/alpha/sys/brk.S
+++ b/lib/libc/alpha/sys/brk.S
@@ -27,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 	.globl	_end
diff --git a/lib/libc/alpha/sys/cerror.S b/lib/libc/alpha/sys/cerror.S
index e5b18f727e65e..5744129807bf1 100644
--- a/lib/libc/alpha/sys/cerror.S
+++ b/lib/libc/alpha/sys/cerror.S
@@ -1,5 +1,4 @@
-/* $FreeBSD$	*/
-/*	From: NetBSD: cerror.S,v 1.4 1996/11/08 00:52:46 cgd Exp 	*/
+/*	$NetBSD: cerror.S,v 1.4 1996/11/08 00:52:46 cgd Exp $ 	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 #define	FRAME_SIZE		16
diff --git a/lib/libc/alpha/sys/exect.S b/lib/libc/alpha/sys/exect.S
index 345efb2b8abf1..8ad065f695145 100644
--- a/lib/libc/alpha/sys/exect.S
+++ b/lib/libc/alpha/sys/exect.S
@@ -27,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 LEAF(exect, 3)
diff --git a/lib/libc/alpha/sys/fork.S b/lib/libc/alpha/sys/fork.S
index 295e588d5e136..aa4240a45d4ea 100644
--- a/lib/libc/alpha/sys/fork.S
+++ b/lib/libc/alpha/sys/fork.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 SYSCALL(fork)
diff --git a/lib/libc/alpha/sys/pipe.S b/lib/libc/alpha/sys/pipe.S
index 188bfd4154c9b..b7ade3bfbe4a7 100644
--- a/lib/libc/alpha/sys/pipe.S
+++ b/lib/libc/alpha/sys/pipe.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 SYSCALL(pipe)
diff --git a/lib/libc/alpha/sys/ptrace.S b/lib/libc/alpha/sys/ptrace.S
index 931b43f003627..8e4c371f7f0c6 100644
--- a/lib/libc/alpha/sys/ptrace.S
+++ b/lib/libc/alpha/sys/ptrace.S
@@ -27,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 LEAF(ptrace, 4)
diff --git a/lib/libc/alpha/sys/sbrk.S b/lib/libc/alpha/sys/sbrk.S
index 5f4e15a222178..4d79906502292 100644
--- a/lib/libc/alpha/sys/sbrk.S
+++ b/lib/libc/alpha/sys/sbrk.S
@@ -27,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 	.globl	_end
diff --git a/lib/libc/alpha/sys/setlogin.S b/lib/libc/alpha/sys/setlogin.S
index e542b2d7bb377..bfc36b6d40672 100644
--- a/lib/libc/alpha/sys/setlogin.S
+++ b/lib/libc/alpha/sys/setlogin.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 IMPORT(_logname_valid, 4)			/* in _getlogin() */
diff --git a/lib/libc/alpha/sys/sigreturn.S b/lib/libc/alpha/sys/sigreturn.S
index 0931f507bf67c..9b13d5f1a1368 100644
--- a/lib/libc/alpha/sys/sigreturn.S
+++ b/lib/libc/alpha/sys/sigreturn.S
@@ -25,10 +25,11 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 /*