35 files changed, 85 insertions, 44 deletions

diff --git a/lib/libc/ia64/gen/__divdf3.S b/lib/libc/ia64/gen/__divdf3.S
index f27d3e0b313e..58425d92dbaa 100644
--- a/lib/libc/ia64/gen/__divdf3.S
+++ b/lib/libc/ia64/gen/__divdf3.S
@@ -1,5 +1,3 @@
-// $FreeBSD$
-
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
@@ -28,6 +26,7 @@
 //
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
   .section .text
 
diff --git a/lib/libc/ia64/gen/__divdi3.S b/lib/libc/ia64/gen/__divdi3.S
index 7b06bf46e334..92e29116f6e2 100644
--- a/lib/libc/ia64/gen/__divdi3.S
+++ b/lib/libc/ia64/gen/__divdi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__divdi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 .proc __divdi3#
 .align 32
diff --git a/lib/libc/ia64/gen/__divsf3.S b/lib/libc/ia64/gen/__divsf3.S
index e962415c796d..fe7bcb4d68ee 100644
--- a/lib/libc/ia64/gen/__divsf3.S
+++ b/lib/libc/ia64/gen/__divsf3.S
@@ -1,5 +1,3 @@
-// $FreeBSD$
-
 //  
 // Copyright (c) 2000, Intel Corporation
 // All rights reserved.
@@ -28,6 +26,7 @@
 //
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(__divsf3, 0)
 { .mfi
diff --git a/lib/libc/ia64/gen/__divsi3.S b/lib/libc/ia64/gen/__divsi3.S
index 7c088e9f21df..4c82e32ddcf1 100644
--- a/lib/libc/ia64/gen/__divsi3.S
+++ b/lib/libc/ia64/gen/__divsi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__divsi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
 // 32-bit signed integer divide
diff --git a/lib/libc/ia64/gen/__moddi3.S b/lib/libc/ia64/gen/__moddi3.S
index 897066cfb7c4..e15f964c6ff9 100644
--- a/lib/libc/ia64/gen/__moddi3.S
+++ b/lib/libc/ia64/gen/__moddi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__moddi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
 // 64-bit signed integer remainder
diff --git a/lib/libc/ia64/gen/__modsi3.S b/lib/libc/ia64/gen/__modsi3.S
index f91cf75ec48c..1939493eff38 100644
--- a/lib/libc/ia64/gen/__modsi3.S
+++ b/lib/libc/ia64/gen/__modsi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__modsi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
 // 32-bit signed integer remainder
diff --git a/lib/libc/ia64/gen/__udivdi3.S b/lib/libc/ia64/gen/__udivdi3.S
index 6a9fad4ce455..1233e8aa4105 100644
--- a/lib/libc/ia64/gen/__udivdi3.S
+++ b/lib/libc/ia64/gen/__udivdi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__udivdi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 .proc __udivdi3#
 .align 32
diff --git a/lib/libc/ia64/gen/__udivsi3.S b/lib/libc/ia64/gen/__udivsi3.S
index 0ac0369c50fc..25959b88a922 100644
--- a/lib/libc/ia64/gen/__udivsi3.S
+++ b/lib/libc/ia64/gen/__udivsi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__udivsi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
 // 32-bit unsigned integer divide
diff --git a/lib/libc/ia64/gen/__umoddi3.S b/lib/libc/ia64/gen/__umoddi3.S
index 05a030439eab..509c62bb687e 100644
--- a/lib/libc/ia64/gen/__umoddi3.S
+++ b/lib/libc/ia64/gen/__umoddi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__umoddi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
   // 64-bit unsigned integer remainder
diff --git a/lib/libc/ia64/gen/__umodsi3.S b/lib/libc/ia64/gen/__umodsi3.S
index 5076e76a1e5e..697db2e5d8c9 100644
--- a/lib/libc/ia64/gen/__umodsi3.S
+++ b/lib/libc/ia64/gen/__umodsi3.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 .file "__umodsi3.s"
 
 //  
@@ -28,6 +27,9 @@
 // http://developer.intel.com/opensource.
 //
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 .section .text
 
 // 32-bit unsigned integer remainder
diff --git a/lib/libc/ia64/gen/_setjmp.S b/lib/libc/ia64/gen/_setjmp.S
index 5f15cd497156..a48e5f13f1a7 100644
--- a/lib/libc/ia64/gen/_setjmp.S
+++ b/lib/libc/ia64/gen/_setjmp.S
@@ -1,4 +1,3 @@
-// $FreeBSD$
 //
 // Copyright (c) 1999, 2000
 // Intel Corporation.
@@ -51,8 +50,10 @@
 
     .file   "setjmp.s"
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define     LOCORE
-#include    <machine/asm.h>
 #include    <machine/setjmp.h>
 
 // int _setjmp(struct jmp_buffer *)
diff --git a/lib/libc/ia64/gen/fabs.S b/lib/libc/ia64/gen/fabs.S
index 786606b67339..036d49201321 100644
--- a/lib/libc/ia64/gen/fabs.S
+++ b/lib/libc/ia64/gen/fabs.S
@@ -22,11 +22,10 @@
  * 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$");
 
 ENTRY(fabs, 1)
 	fabs	fret0=farg0
diff --git a/lib/libc/ia64/gen/setjmp.S b/lib/libc/ia64/gen/setjmp.S
index 817e3337a042..7b1eb6797e2c 100644
--- a/lib/libc/ia64/gen/setjmp.S
+++ b/lib/libc/ia64/gen/setjmp.S
@@ -1,5 +1,4 @@
 /*	$NetBSD: setjmp.S,v 1.3 1997/12/05 02:06:27 thorpej Exp $	*/
-/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,8 +27,10 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define     LOCORE
-#include    <machine/asm.h>
 #include    <machine/setjmp.h>
 
 /*
diff --git a/lib/libc/ia64/gen/sigsetjmp.S b/lib/libc/ia64/gen/sigsetjmp.S
index 37e6f950c1c9..9f02a26a5a7a 100644
--- a/lib/libc/ia64/gen/sigsetjmp.S
+++ b/lib/libc/ia64/gen/sigsetjmp.S
@@ -1,5 +1,4 @@
 /*	$NetBSD: sigsetjmp.S,v 1.2 1996/10/17 03:08:07 cgd Exp $	*/
-/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,8 +27,10 @@
  * rights to redistribute these changes.
  */
 
-#define LOCORE
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+#define LOCORE
 #include <machine/setjmp.h>
 
 /*
diff --git a/lib/libc/ia64/net/byte_swap_2.S b/lib/libc/ia64/net/byte_swap_2.S
index 19d0eefbec8f..34498b7bc200 100644
--- a/lib/libc/ia64/net/byte_swap_2.S
+++ b/lib/libc/ia64/net/byte_swap_2.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $	*/
 
 /*
@@ -29,6 +28,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/ia64/net/byte_swap_4.S b/lib/libc/ia64/net/byte_swap_4.S
index 71019ba4c4c8..c5daa81d0213 100644
--- a/lib/libc/ia64/net/byte_swap_4.S
+++ b/lib/libc/ia64/net/byte_swap_4.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $	*/
 
 /*
@@ -29,6 +28,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #if !defined(ALIAS) || !defined(NAME)
 #error ALIAS or NAME not defined
diff --git a/lib/libc/ia64/net/htonl.S b/lib/libc/ia64/net/htonl.S
index 7a71a29d90ee..05c906c1bbbf 100644
--- a/lib/libc/ia64/net/htonl.S
+++ b/lib/libc/ia64/net/htonl.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	htonl
 #define	NAME	__htonl
 
diff --git a/lib/libc/ia64/net/htons.S b/lib/libc/ia64/net/htons.S
index 689b367938ee..4bd3a8b61b60 100644
--- a/lib/libc/ia64/net/htons.S
+++ b/lib/libc/ia64/net/htons.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	htons
 #define	NAME	__htons
 
diff --git a/lib/libc/ia64/net/ntohl.S b/lib/libc/ia64/net/ntohl.S
index 9e2c612d618c..a08a1627e28e 100644
--- a/lib/libc/ia64/net/ntohl.S
+++ b/lib/libc/ia64/net/ntohl.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ntohl.S,v 1.1 1996/04/17 22:36:57 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	ntohl
 #define	NAME	__ntohl
 
diff --git a/lib/libc/ia64/net/ntohs.S b/lib/libc/ia64/net/ntohs.S
index 16a884b924bf..79e6e0c73d09 100644
--- a/lib/libc/ia64/net/ntohs.S
+++ b/lib/libc/ia64/net/ntohs.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ntohs.S,v 1.1 1996/04/17 22:37:02 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #define	ALIAS	ntohs
 #define	NAME	__ntohs
 
diff --git a/lib/libc/ia64/string/bcopy.S b/lib/libc/ia64/string/bcopy.S
index 5a2f9fd1190d..09f5bc0791c1 100644
--- a/lib/libc/ia64/string/bcopy.S
+++ b/lib/libc/ia64/string/bcopy.S
@@ -27,6 +27,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Not the fastest bcopy in the world.
diff --git a/lib/libc/ia64/string/bzero.S b/lib/libc/ia64/string/bzero.S
index 1d1519e1f06a..bd08a1a7258b 100644
--- a/lib/libc/ia64/string/bzero.S
+++ b/lib/libc/ia64/string/bzero.S
@@ -27,6 +27,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(bzero, 2)
 	
diff --git a/lib/libc/ia64/string/ffs.S b/lib/libc/ia64/string/ffs.S
index c4ffd1bf4e73..d99d76581341 100644
--- a/lib/libc/ia64/string/ffs.S
+++ b/lib/libc/ia64/string/ffs.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ffs.S,v 1.3 1996/10/17 03:08:13 cgd Exp $	*/
 
 /*
@@ -33,6 +32,7 @@
  */
 
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 ENTRY(ffs, 1)
 	sxt4	r14=in0 ;;
diff --git a/lib/libc/ia64/string/memcpy.S b/lib/libc/ia64/string/memcpy.S
index 572e49a843e2..d9937fbe217a 100644
--- a/lib/libc/ia64/string/memcpy.S
+++ b/lib/libc/ia64/string/memcpy.S
@@ -22,11 +22,10 @@
  * 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$");
 
 ENTRY(memcpy,3)
 	
diff --git a/lib/libc/ia64/string/memmove.S b/lib/libc/ia64/string/memmove.S
index 5586a6049236..06639d15f682 100644
--- a/lib/libc/ia64/string/memmove.S
+++ b/lib/libc/ia64/string/memmove.S
@@ -22,11 +22,10 @@
  * 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$");
 
 ENTRY(memmove,3)
 	
diff --git a/lib/libc/ia64/sys/Ovfork.S b/lib/libc/ia64/sys/Ovfork.S
index 1e39ef7397c7..bdd7ce3e68e6 100644
--- a/lib/libc/ia64/sys/Ovfork.S
+++ b/lib/libc/ia64/sys/Ovfork.S
@@ -22,9 +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"
 
 SYSCALL(vfork)
diff --git a/lib/libc/ia64/sys/brk.S b/lib/libc/ia64/sys/brk.S
index a8d910c859d8..d3258868acd2 100644
--- a/lib/libc/ia64/sys/brk.S
+++ b/lib/libc/ia64/sys/brk.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: brk.S,v 1.4 1996/10/17 03:08:15 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 	.globl	_end
diff --git a/lib/libc/ia64/sys/cerror.S b/lib/libc/ia64/sys/cerror.S
index da35bd7e48cb..ca0b0c735b1b 100644
--- a/lib/libc/ia64/sys/cerror.S
+++ b/lib/libc/ia64/sys/cerror.S
@@ -22,11 +22,10 @@
  * 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$");
 
 
 ENTRY(.cerror, 0)
diff --git a/lib/libc/ia64/sys/exect.S b/lib/libc/ia64/sys/exect.S
index d1c68b4b5d23..817d3b1b3848 100644
--- a/lib/libc/ia64/sys/exect.S
+++ b/lib/libc/ia64/sys/exect.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: exect.S,v 1.2 1996/10/17 03:08:18 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 ENTRY(exect, 3)
diff --git a/lib/libc/ia64/sys/fork.S b/lib/libc/ia64/sys/fork.S
index 2657e0dbcc97..886bf9b97c63 100644
--- a/lib/libc/ia64/sys/fork.S
+++ b/lib/libc/ia64/sys/fork.S
@@ -22,9 +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"
 
 SYSCALL(fork)
diff --git a/lib/libc/ia64/sys/pipe.S b/lib/libc/ia64/sys/pipe.S
index 3254341b09d7..0b2600c7198c 100644
--- a/lib/libc/ia64/sys/pipe.S
+++ b/lib/libc/ia64/sys/pipe.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: pipe.S,v 1.1 1995/02/10 17:50:35 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 SYSCALL(pipe)
diff --git a/lib/libc/ia64/sys/ptrace.S b/lib/libc/ia64/sys/ptrace.S
index 913a22de1041..b6d3abdedda9 100644
--- a/lib/libc/ia64/sys/ptrace.S
+++ b/lib/libc/ia64/sys/ptrace.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ptrace.S,v 1.4 1996/11/08 00:51:24 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 ENTRY(ptrace, 4)
diff --git a/lib/libc/ia64/sys/sbrk.S b/lib/libc/ia64/sys/sbrk.S
index f46f34491e76..1dc4cf2e30c0 100644
--- a/lib/libc/ia64/sys/sbrk.S
+++ b/lib/libc/ia64/sys/sbrk.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: sbrk.S,v 1.4 1996/10/17 03:08:20 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 	.globl	_end
diff --git a/lib/libc/ia64/sys/setlogin.S b/lib/libc/ia64/sys/setlogin.S
index 2f80ddf60fe8..73a55b68ab85 100644
--- a/lib/libc/ia64/sys/setlogin.S
+++ b/lib/libc/ia64/sys/setlogin.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: setlogin.S,v 1.1 1995/02/10 17:50:39 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 IMPORT(_logname_valid, 4)			/* in getlogin() */
diff --git a/lib/libc/ia64/sys/sigreturn.S b/lib/libc/ia64/sys/sigreturn.S
index 57416b1497f7..2c7a710a1461 100644
--- a/lib/libc/ia64/sys/sigreturn.S
+++ b/lib/libc/ia64/sys/sigreturn.S
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: sigreturn.S,v 1.1 1995/02/10 17:50:42 cgd Exp $	*/
 
 /*
@@ -28,6 +27,9 @@
  * rights to redistribute these changes.
  */
 
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include "SYS.h"
 
 /*