Use FBSDID

13 files changed, 32 insertions, 84 deletions

diff --git a/lib/libc/sparc64/net/htonl.S b/lib/libc/sparc64/net/htonl.S
index e972dfc..2ba02c4 100644
--- a/lib/libc/sparc64/net/htonl.S
+++ b/lib/libc/sparc64/net/htonl.S
@@ -40,17 +40,12 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)htonl.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: htonl.S,v 1.1 1998/09/11 04:56:30 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+__FBSDID("$FreeBSD$");
 
 /* netorder = htonl(hostorder) */
         .weak CNAME(htonl)
diff --git a/lib/libc/sparc64/net/htons.S b/lib/libc/sparc64/net/htons.S
index 6f1fa70..16035e0 100644
--- a/lib/libc/sparc64/net/htons.S
+++ b/lib/libc/sparc64/net/htons.S
@@ -40,17 +40,12 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)htons.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: htons.S,v 1.1 1998/09/11 04:56:30 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+__FBSDID("$FreeBSD$");
 
 /* netorder = htons(hostorder) */
         .weak CNAME(htons)
diff --git a/lib/libc/sparc64/net/ntohl.S b/lib/libc/sparc64/net/ntohl.S
index 1313a45..4333f23 100644
--- a/lib/libc/sparc64/net/ntohl.S
+++ b/lib/libc/sparc64/net/ntohl.S
@@ -40,17 +40,12 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)ntohl.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: ntohl.S,v 1.1 1998/09/11 04:56:31 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+__FBSDID("$FreeBSD$");
 
 /* hostorder = ntohl(netorder) */
         .weak CNAME(ntohl)
diff --git a/lib/libc/sparc64/net/ntohs.S b/lib/libc/sparc64/net/ntohs.S
index 1b144a9..03a09b5 100644
--- a/lib/libc/sparc64/net/ntohs.S
+++ b/lib/libc/sparc64/net/ntohs.S
@@ -40,17 +40,12 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)ntohs.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: ntohs.S,v 1.1 1998/09/11 04:56:31 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+__FBSDID("$FreeBSD$");
 
 /* hostorder = ntohs(netorder) */
         .weak CNAME(ntohs)
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
index e6055b1..502f81a 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S
@@ -24,12 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
-
 #include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/utrap.h>
 
 ENTRY(__sparc_utrap_fp_disabled)
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_gen.S b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
index a9f4e60..6f6f0e3 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_gen.S
+++ b/lib/libc/sparc64/sys/__sparc_utrap_gen.S
@@ -24,17 +24,14 @@
  * SUCH DAMAGE.
  */
 
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 	.register	%g2, #ignore
 	.register	%g3, #ignore
 	.register	%g6, #ignore
 	.register	%g7, #ignore
 
-#include <machine/asm.h>
 #include <machine/tstate.h>
 #include <machine/utrap.h>
 
diff --git a/lib/libc/sparc64/sys/brk.S b/lib/libc/sparc64/sys/brk.S
index 39e7635..018c877 100644
--- a/lib/libc/sparc64/sys/brk.S
+++ b/lib/libc/sparc64/sys/brk.S
@@ -38,17 +38,13 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: brk.S,v 1.9 2000/07/25 20:15:40 mycroft Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/cerror.S b/lib/libc/sparc64/sys/cerror.S
index 0ccdc07..c75f27c 100644
--- a/lib/libc/sparc64/sys/cerror.S
+++ b/lib/libc/sparc64/sys/cerror.S
@@ -36,10 +36,8 @@
  *	from: FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.11 2001/08/13
  */
 
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/exect.S b/lib/libc/sparc64/sys/exect.S
index 34a6b3b..f8e3883 100644
--- a/lib/libc/sparc64/sys/exect.S
+++ b/lib/libc/sparc64/sys/exect.S
@@ -38,17 +38,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)exect.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: exect.S,v 1.1 1998/09/11 04:56:34 eeh Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/pipe.S b/lib/libc/sparc64/sys/pipe.S
index a031011..1168134 100644
--- a/lib/libc/sparc64/sys/pipe.S
+++ b/lib/libc/sparc64/sys/pipe.S
@@ -38,17 +38,13 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)pipe.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: pipe.S,v 1.3 2000/09/28 08:38:55 kleink Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/ptrace.S b/lib/libc/sparc64/sys/ptrace.S
index cbdacf0..5fd35fd 100644
--- a/lib/libc/sparc64/sys/ptrace.S
+++ b/lib/libc/sparc64/sys/ptrace.S
@@ -39,17 +39,13 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)ptrace.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: ptrace.S,v 1.4 2000/07/24 00:11:10 mycroft Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/sbrk.S b/lib/libc/sparc64/sys/sbrk.S
index 3a6a454..2ade273 100644
--- a/lib/libc/sparc64/sys/sbrk.S
+++ b/lib/libc/sparc64/sys/sbrk.S
@@ -38,17 +38,13 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: sbrk.S,v 1.7 2000/07/25 15:14:46 mycroft Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
diff --git a/lib/libc/sparc64/sys/setlogin.S b/lib/libc/sparc64/sys/setlogin.S
index 0cbbd9f..480e9ec 100644
--- a/lib/libc/sparc64/sys/setlogin.S
+++ b/lib/libc/sparc64/sys/setlogin.S
@@ -38,17 +38,13 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-#if 0
 	.asciz "@(#)setlogin.s	8.1 (Berkeley) 6/4/93"
-#else
+#if 0
 	RCSID("$NetBSD: setlogin.S,v 1.3 2000/07/21 03:14:15 eeh Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */
-
-#if defined(SYSLIBC_RCS) && !defined(lint)
-	.text
-	.asciz "$FreeBSD$"
-#endif /* SYSLIBC_RCS and not lint */
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
 
 #include "SYS.h"