Use __FBSDID.

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

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

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

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

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> */

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"
 
 /*

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

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

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

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
 

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
 

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
 

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
 

lib/libc/alpha/string/bcopy.S

@@ -29,6 +29,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if defined(MEMCOPY) || defined(MEMMOVE)
 #ifdef MEMCOPY

lib/libc/alpha/string/bzero.S

@@ -28,6 +28,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 LEAF(bzero,2)
 	ble	a1,bzero_done

lib/libc/alpha/string/ffs.S

@@ -32,6 +32,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 LEAF(ffs, 1)
 	addl	a0, 0, t0

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"

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"

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)

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

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

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)

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)

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)

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)

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

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() */

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"
 
 /*