Here's the revised diff that removes $FreeBSD$ IDs from my previous diff.
Index: lib/libc/arch/amd64/sys/tfork_thread.S
===================================================================
RCS file: /cvs/src/lib/libc/arch/amd64/sys/tfork_thread.S,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 tfork_thread.S
--- lib/libc/arch/amd64/sys/tfork_thread.S 7 May 2016 19:05:21 -0000
1.6
+++ lib/libc/arch/amd64/sys/tfork_thread.S 15 Mar 2019 03:37:05 -0000
@@ -27,9 +27,6 @@
*/
#include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/amd64/gen/rfork_thread.S,v
1.1 2003/10/13 20:32:33 alc Exp $");
-#endif
/*
* With thanks to John Dyson for the original version of this.
Index: lib/libc/arch/i386/sys/tfork_thread.S
===================================================================
RCS file: /cvs/src/lib/libc/arch/i386/sys/tfork_thread.S,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 tfork_thread.S
--- lib/libc/arch/i386/sys/tfork_thread.S 7 May 2016 19:05:21 -0000
1.8
+++ lib/libc/arch/i386/sys/tfork_thread.S 15 Mar 2019 03:37:05 -0000
@@ -26,9 +26,6 @@
*/
#include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/i386/gen/rfork_thread.S,v 1.5
2003/05/07 17:23:25 jhb Exp $");
-#endif
/*
* With thanks to John Dyson for the original version of this.
Index: lib/libc/arch/sparc64/fpu/fpu_add.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_add.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 fpu_add.c
--- lib/libc/arch/sparc64/fpu/fpu_add.c 5 Dec 2012 23:19:59 -0000 1.2
+++ lib/libc/arch/sparc64/fpu/fpu_add.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_add.c,v 1.4 2002/04/27
21:56:28 jake Exp $");
-#endif
-
/*
* Perform an FPU add (return x + y).
*
Index: lib/libc/arch/sparc64/fpu/fpu_compare.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_compare.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 fpu_compare.c
--- lib/libc/arch/sparc64/fpu/fpu_compare.c 5 Dec 2012 23:19:59 -0000
1.2
+++ lib/libc/arch/sparc64/fpu/fpu_compare.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_compare.c,v 1.4 2002/03/22
21:52:58 obrien Exp $");
-#endif
-
/*
* CMP and CMPE instructions.
*
Index: lib/libc/arch/sparc64/fpu/fpu_div.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_div.c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 fpu_div.c
--- lib/libc/arch/sparc64/fpu/fpu_div.c 26 Nov 2013 20:33:07 -0000 1.3
+++ lib/libc/arch/sparc64/fpu/fpu_div.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_div.c,v 1.3 2002/03/22
21:52:58 obrien Exp $");
-#endif
-
/*
* Perform an FPU divide (return x / y).
*/
Index: lib/libc/arch/sparc64/fpu/fpu_explode.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_explode.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 fpu_explode.c
--- lib/libc/arch/sparc64/fpu/fpu_explode.c 8 May 2016 18:41:17 -0000
1.8
+++ lib/libc/arch/sparc64/fpu/fpu_explode.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.5 2002/05/11
21:20:04 jake Exp $");
-#endif
-
/*
* FPU subroutines: `explode' the machine's `packed binary' format numbers
* into our internal format.
Index: lib/libc/arch/sparc64/fpu/fpu_implode.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_implode.c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 fpu_implode.c
--- lib/libc/arch/sparc64/fpu/fpu_implode.c 15 Nov 2015 22:41:43 -0000
1.5
+++ lib/libc/arch/sparc64/fpu/fpu_implode.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_implode.c,v 1.5 2002/04/27
21:56:28 jake Exp $");
-#endif
-
/*
* FPU subroutines: `implode' internal format numbers into the machine's
* `packed binary' format.
Index: lib/libc/arch/sparc64/fpu/fpu_mul.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_mul.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 fpu_mul.c
--- lib/libc/arch/sparc64/fpu/fpu_mul.c 5 Dec 2012 23:19:59 -0000 1.2
+++ lib/libc/arch/sparc64/fpu/fpu_mul.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_mul.c,v 1.3 2002/03/22
21:52:58 obrien Exp $");
-#endif
-
/*
* Perform an FPU multiply (return x * y).
*/
Index: lib/libc/arch/sparc64/fpu/fpu_qp.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_qp.c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 fpu_qp.c
--- lib/libc/arch/sparc64/fpu/fpu_qp.c 8 May 2016 18:41:17 -0000 1.6
+++ lib/libc/arch/sparc64/fpu/fpu_qp.c 15 Mar 2019 03:37:05 -0000
@@ -26,10 +26,6 @@
* SUCH DAMAGE.
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.3 2002/09/02
02:30:20 jake Exp $");
-#endif
-
#include <sys/types.h>
#include <machine/fsr.h>
Index: lib/libc/arch/sparc64/fpu/fpu_sqrt.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_sqrt.c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 fpu_sqrt.c
--- lib/libc/arch/sparc64/fpu/fpu_sqrt.c 12 Sep 2014 22:04:18 -0000
1.4
+++ lib/libc/arch/sparc64/fpu/fpu_sqrt.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.3 2002/03/22
21:52:58 obrien Exp $");
-#endif
-
/*
* Perform an FPU square root (return sqrt(x)).
*/
Index: lib/libc/arch/sparc64/fpu/fpu_subr.c
===================================================================
RCS file: /cvs/src/lib/libc/arch/sparc64/fpu/fpu_subr.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 fpu_subr.c
--- lib/libc/arch/sparc64/fpu/fpu_subr.c 5 Dec 2012 23:19:59 -0000
1.2
+++ lib/libc/arch/sparc64/fpu/fpu_subr.c 15 Mar 2019 03:37:05 -0000
@@ -45,10 +45,6 @@
* $NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $
*/
-#if 0
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_subr.c,v 1.4 2002/04/27
21:56:28 jake Exp $");
-#endif
-
/*
* FPU subroutines.
*/
Index: lib/libm/src/s_lrintl.c
===================================================================
RCS file: /cvs/src/lib/libm/src/s_lrintl.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 s_lrintl.c
--- lib/libm/src/s_lrintl.c 5 Dec 2012 23:20:04 -0000 1.2
+++ lib/libm/src/s_lrintl.c 15 Mar 2019 03:37:05 -0000
@@ -30,9 +30,6 @@
#include <math.h>
#ifndef type
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_lrint.c,v 1.1 2005/01/11 23:12:55 das
Exp $");
-#endif
#define type long double
#define roundit rintl
#define dtype long
Index: lib/libm/src/s_lroundl.c
===================================================================
RCS file: /cvs/src/lib/libm/src/s_lroundl.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 s_lroundl.c
--- lib/libm/src/s_lroundl.c 5 Dec 2012 23:20:04 -0000 1.2
+++ lib/libm/src/s_lroundl.c 15 Mar 2019 03:37:05 -0000
@@ -31,9 +31,6 @@
#include <math.h>
#ifndef type
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_lround.c,v 1.2 2005/04/08 00:52:16 das
Exp $");
-#endif
#define type long double
#define roundit roundl
#define dtype long
Index: sys/arch/arm64/arm64/cpufunc_asm.S
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/cpufunc_asm.S,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 cpufunc_asm.S
--- sys/arch/arm64/arm64/cpufunc_asm.S 12 Aug 2018 17:15:10 -0000 1.5
+++ sys/arch/arm64/arm64/cpufunc_asm.S 15 Mar 2019 03:37:08 -0000
@@ -27,12 +27,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.
- *
*/
#include <machine/asm.h>
#include <machine/param.h>
-//__FBSDID("$FreeBSD: head/sys/arm64/arm64/cpufunc_asm.S 305546 2016-09-07
16:46:54Z andrew $");
/*
* FIXME:
Index: sys/arch/arm64/arm64/exception.S
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/exception.S,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 exception.S
--- sys/arch/arm64/arm64/exception.S 3 Aug 2018 18:36:01 -0000 1.8
+++ sys/arch/arm64/arm64/exception.S 15 Mar 2019 03:37:08 -0000
@@ -23,14 +23,9 @@
* 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.
- *
*/
#include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/exception.S 297028 2016-03-18
16:18:29Z andrew $");
-#endif
-
#include <machine/armreg.h>
#include "assym.h"
Index: sys/arch/arm64/arm64/support.S
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/support.S,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 support.S
--- sys/arch/arm64/arm64/support.S 7 Sep 2018 01:32:01 -0000 1.8
+++ sys/arch/arm64/arm64/support.S 15 Mar 2019 03:37:08 -0000
@@ -27,13 +27,9 @@
* 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.
- *
*/
#include <machine/asm.h>
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/support.S 297615 2016-04-06 14:08:10Z
andrew $");
-#endif
#include <machine/setjmp.h>
#include <machine/param.h>
Index: sys/arch/arm64/arm64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/trap.c,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 trap.c
--- sys/arch/arm64/arm64/trap.c 8 Oct 2018 15:57:53 -0000 1.21
+++ sys/arch/arm64/arm64/trap.c 15 Mar 2019 03:37:08 -0000
@@ -23,12 +23,7 @@
* 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.
- *
*/
-
-#if 0
-__FBSDID("$FreeBSD: head/sys/arm64/arm64/trap.c 281654 2015-04-17 12:58:09Z
andrew $");
-#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: sys/dev/pci/if_bnxt.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_bnxt.c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 if_bnxt.c
--- sys/dev/pci/if_bnxt.c 22 Jan 2019 02:04:30 -0000 1.18
+++ sys/dev/pci/if_bnxt.c 15 Mar 2019 03:37:08 -0000
@@ -62,7 +62,6 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
-#define __FBSDID(x)
#include <dev/pci/if_bnxtreg.h>
#include <net/if.h>
Index: sys/dev/pci/if_bnxtreg.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_bnxtreg.h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 if_bnxtreg.h
--- sys/dev/pci/if_bnxtreg.h 9 Jul 2018 10:46:15 -0000 1.1
+++ sys/dev/pci/if_bnxtreg.h 15 Mar 2019 03:37:10 -0000
@@ -28,9 +28,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/bnxt/hsi_struct_def.h 323233 2017-09-06
20:19:30Z shurd $");
-
/****************************************************************************
*
* Description: Definition of HSI data structures
Index: sys/kern/subr_witness.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_witness.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 subr_witness.c
--- sys/kern/subr_witness.c 7 Feb 2019 15:11:38 -0000 1.29
+++ sys/kern/subr_witness.c 15 Mar 2019 03:37:10 -0000
@@ -86,10 +86,6 @@
* will not result in a lock order reversal.
*/
-#if 0
-__FBSDID("$FreeBSD: head/sys/kern/subr_witness.c 313261 2017-02-05 02:27:04Z
markj $");
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
Index: sys/ufs/ufs/ufs_dirhash.c
===================================================================
RCS file: /cvs/src/sys/ufs/ufs/ufs_dirhash.c,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 ufs_dirhash.c
--- sys/ufs/ufs/ufs_dirhash.c 6 Mar 2019 00:34:08 -0000 1.41
+++ sys/ufs/ufs/ufs_dirhash.c 15 Mar 2019 03:37:10 -0000
@@ -28,10 +28,6 @@
* This implements a hash-based lookup scheme for UFS directories.
*/
-#if 0
-__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.18 2004/02/15 21:39:35
dwmalone Exp $");
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
