12 files changed, 42 insertions, 29 deletions

diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 2c454e319283..650cf1f189a0 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -62,12 +62,13 @@
  * 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.
  *
- *	from: @(#)fpu.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp
- *
- * $FreeBSD$
+ *	@(#)fpu.c	8.1 (Berkeley) 6/11/93
+ *	$NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include "namespace.h"
diff --git a/lib/libc/sparc64/fpu/fpu_add.c b/lib/libc/sparc64/fpu/fpu_add.c
index 5be2261bee78..e321e4158cfc 100644
--- a/lib/libc/sparc64/fpu/fpu_add.c
+++ b/lib/libc/sparc64/fpu/fpu_add.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_add.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Perform an FPU add (return x + y).
  *
diff --git a/lib/libc/sparc64/fpu/fpu_compare.c b/lib/libc/sparc64/fpu/fpu_compare.c
index 4eaabde22614..428e8d39990f 100644
--- a/lib/libc/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/sparc64/fpu/fpu_compare.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_compare.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * CMP and CMPE instructions.
  *
diff --git a/lib/libc/sparc64/fpu/fpu_div.c b/lib/libc/sparc64/fpu/fpu_div.c
index c3895c2fdc72..a7b4782961b9 100644
--- a/lib/libc/sparc64/fpu/fpu_div.c
+++ b/lib/libc/sparc64/fpu/fpu_div.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_div.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Perform an FPU divide (return x / y).
  */
diff --git a/lib/libc/sparc64/fpu/fpu_explode.c b/lib/libc/sparc64/fpu/fpu_explode.c
index 48c22fee0c6c..baa2da265ba7 100644
--- a/lib/libc/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/sparc64/fpu/fpu_explode.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_explode.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FPU subroutines: `explode' the machine's `packed binary' format numbers
  * into our internal format.
diff --git a/lib/libc/sparc64/fpu/fpu_implode.c b/lib/libc/sparc64/fpu/fpu_implode.c
index cb7b206aaa43..27a826a1ea0d 100644
--- a/lib/libc/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/sparc64/fpu/fpu_implode.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_implode.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FPU subroutines: `implode' internal format numbers into the machine's
  * `packed binary' format.
diff --git a/lib/libc/sparc64/fpu/fpu_mul.c b/lib/libc/sparc64/fpu/fpu_mul.c
index 4f6b691c7f81..0bdb6ff52c34 100644
--- a/lib/libc/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/sparc64/fpu/fpu_mul.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_mul.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Perform an FPU multiply (return x * y).
  */
diff --git a/lib/libc/sparc64/fpu/fpu_sqrt.c b/lib/libc/sparc64/fpu/fpu_sqrt.c
index 044ee07c26bc..c35e2bc7a72e 100644
--- a/lib/libc/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/sparc64/fpu/fpu_sqrt.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_sqrt.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Perform an FPU square root (return sqrt(x)).
  */
diff --git a/lib/libc/sparc64/fpu/fpu_subr.c b/lib/libc/sparc64/fpu/fpu_subr.c
index 7d6769d82695..97300a3c3915 100644
--- a/lib/libc/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/sparc64/fpu/fpu_subr.c
@@ -40,11 +40,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)fpu_subr.c	8.1 (Berkeley) 6/11/93
- *	from: NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp
- *
- * $FreeBSD$
+ *	$NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FPU subroutines.
  */
diff --git a/lib/libc/sparc64/gen/infinity.c b/lib/libc/sparc64/gen/infinity.c
index 529868ea6120..3a5cd47e4c78 100644
--- a/lib/libc/sparc64/gen/infinity.c
+++ b/lib/libc/sparc64/gen/infinity.c
@@ -1,7 +1,9 @@
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 /* infinity.c */
diff --git a/lib/libc/sparc64/gen/isinf.c b/lib/libc/sparc64/gen/isinf.c
index f1f529f10717..996ad1235053 100644
--- a/lib/libc/sparc64/gen/isinf.c
+++ b/lib/libc/sparc64/gen/isinf.c
@@ -24,7 +24,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	from: NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp
+ *	$NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $
  *	from: FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.2 2000/05/10
  */
 
diff --git a/lib/libc/sparc64/gen/ldexp.c b/lib/libc/sparc64/gen/ldexp.c
index 5f0fe3991543..3a85612d47dd 100644
--- a/lib/libc/sparc64/gen/ldexp.c
+++ b/lib/libc/sparc64/gen/ldexp.c
@@ -35,9 +35,11 @@
  */
 
 #include <sys/cdefs.h>
+#if 0
 #if defined(LIBC_SCCS) && !defined(lint)
 __RCSID("$NetBSD: ldexp.c,v 1.8 1999/08/30 18:28:26 mycroft Exp $");
 #endif /* LIBC_SCCS and not lint */
+#endif
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>