Re: __RCSID() in tools/libelf (Re: CVS commit: src)

To: tech-toolchain%NetBSD.org@localhost
Subject: Re: __RCSID() in tools/libelf (Re: CVS commit: src)
From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
Date: Tue, 29 Dec 2009 18:53:40 +0900
I wrote:

> build.sh tools on Cygwin 1.7.1 fails around __RCSID() in libelf sources:
 :
> It looks we should include "nbtool_config.h" before __RCSID()
> (or disable it by #if defined(RCSID) etc.) but
> I wonder what is the common way to handle this.

The attached dumb patch works around the problem.
(I still wonder where "__unused" keyword should be handled..)

---

Index: external/bsd/libelf/dist/elf_begin.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_begin.c,v
retrieving revision 1.3
diff -u -r1.3 elf_begin.c
--- external/bsd/libelf/dist/elf_begin.c        20 Dec 2009 23:23:46 -0000      
1.3
+++ external/bsd/libelf/dist/elf_begin.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_begin.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_begin.c,v 1.3 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <sys/types.h>
 #include <sys/mman.h>
Index: external/bsd/libelf/dist/elf_cntl.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_cntl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_cntl.c
--- external/bsd/libelf/dist/elf_cntl.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_cntl.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_cntl.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_cntl.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_data.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_data.c,v
retrieving revision 1.2
diff -u -r1.2 elf_data.c
--- external/bsd/libelf/dist/elf_data.c 20 Dec 2009 23:23:46 -0000      1.2
+++ external/bsd/libelf/dist/elf_data.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_data.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_data.c,v 1.2 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <errno.h>
Index: external/bsd/libelf/dist/elf_end.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_end.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_end.c
--- external/bsd/libelf/dist/elf_end.c  19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_end.c  29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_end.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_end.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <sys/mman.h>
 
Index: external/bsd/libelf/dist/elf_errmsg.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_errmsg.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_errmsg.c
--- external/bsd/libelf/dist/elf_errmsg.c       19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_errmsg.c       29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_errmsg.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_errmsg.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 #include <string.h>
Index: external/bsd/libelf/dist/elf_errno.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_errno.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_errno.c
--- external/bsd/libelf/dist/elf_errno.c        19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_errno.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_errno.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_errno.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_fill.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_fill.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_fill.c
--- external/bsd/libelf/dist/elf_fill.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_fill.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_fill.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_fill.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_flag.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_flag.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_flag.c
--- external/bsd/libelf/dist/elf_flag.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_flag.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_flag.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_flag.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_getarhdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_getarhdr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_getarhdr.c
--- external/bsd/libelf/dist/elf_getarhdr.c     19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_getarhdr.c     29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_getarhdr.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_getarhdr.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_getarsym.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_getarsym.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_getarsym.c
--- external/bsd/libelf/dist/elf_getarsym.c     19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_getarsym.c     29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_getarsym.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_getarsym.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_getbase.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_getbase.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_getbase.c
--- external/bsd/libelf/dist/elf_getbase.c      19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_getbase.c      29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_getbase.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_getbase.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_getident.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_getident.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_getident.c
--- external/bsd/libelf/dist/elf_getident.c     19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_getident.c     29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_getident.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_getident.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <assert.h>
Index: external/bsd/libelf/dist/elf_hash.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_hash.c,v
retrieving revision 1.2
diff -u -r1.2 elf_hash.c
--- external/bsd/libelf/dist/elf_hash.c 19 Dec 2009 07:58:24 -0000      1.2
+++ external/bsd/libelf/dist/elf_hash.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_hash.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_hash.c,v 1.2 2009/12/19 07:58:24 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_kind.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_kind.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_kind.c
--- external/bsd/libelf/dist/elf_kind.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_kind.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_kind.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_kind.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_memory.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_memory.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_memory.c
--- external/bsd/libelf/dist/elf_memory.c       19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_memory.c       29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_memory.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_memory.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/elf_next.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_next.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_next.c
--- external/bsd/libelf/dist/elf_next.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_next.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_next.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_next.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <assert.h>
Index: external/bsd/libelf/dist/elf_phnum.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_phnum.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_phnum.c
--- external/bsd/libelf/dist/elf_phnum.c        19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_phnum.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_phnum.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_phnum.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/elf_rand.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_rand.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_rand.c
--- external/bsd/libelf/dist/elf_rand.c 19 Dec 2009 05:43:39 -0000      1.1.1.1
+++ external/bsd/libelf/dist/elf_rand.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_rand.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_rand.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/elf_rawfile.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_rawfile.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_rawfile.c
--- external/bsd/libelf/dist/elf_rawfile.c      19 Dec 2009 05:43:39 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_rawfile.c      29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_rawfile.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_rawfile.c,v 1.1.1.1 2009/12/19 05:43:39 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/elf_scn.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_scn.c,v
retrieving revision 1.4
diff -u -r1.4 elf_scn.c
--- external/bsd/libelf/dist/elf_scn.c  20 Dec 2009 23:23:46 -0000      1.4
+++ external/bsd/libelf/dist/elf_scn.c  29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_scn.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_scn.c,v 1.4 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <errno.h>
Index: external/bsd/libelf/dist/elf_shnum.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_shnum.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_shnum.c
--- external/bsd/libelf/dist/elf_shnum.c        19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_shnum.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_shnum.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_shnum.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/elf_shstrndx.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_shstrndx.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_shstrndx.c
--- external/bsd/libelf/dist/elf_shstrndx.c     19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_shstrndx.c     29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_shstrndx.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_shstrndx.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/elf_strptr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_strptr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_strptr.c
--- external/bsd/libelf/dist/elf_strptr.c       19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_strptr.c       29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.2.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_strptr.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <sys/param.h>
 
Index: external/bsd/libelf/dist/elf_update.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_update.c,v
retrieving revision 1.2
diff -u -r1.2 elf_update.c
--- external/bsd/libelf/dist/elf_update.c       19 Dec 2009 05:55:37 -0000      
1.2
+++ external/bsd/libelf/dist/elf_update.c       29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_update.c,v 1.5.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_update.c,v 1.2 2009/12/19 05:55:37 thorpej Exp $");
+#endif
 
 #include <sys/mman.h>
 #include <sys/param.h>
Index: external/bsd/libelf/dist/elf_version.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/elf_version.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 elf_version.c
--- external/bsd/libelf/dist/elf_version.c      19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/elf_version.c      29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/elf_version.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: elf_version.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/gelf_cap.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_cap.c,v
retrieving revision 1.3
diff -u -r1.3 gelf_cap.c
--- external/bsd/libelf/dist/gelf_cap.c 19 Dec 2009 07:31:04 -0000      1.3
+++ external/bsd/libelf/dist/gelf_cap.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_cap.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_cap.c,v 1.3 2009/12/19 07:31:04 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_checksum.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_checksum.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gelf_checksum.c
--- external/bsd/libelf/dist/gelf_checksum.c    19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/gelf_checksum.c    29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_checksum.c,v 1.1.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_checksum.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp 
$");
+#endif
 
 #include <gelf.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/gelf_dyn.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_dyn.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_dyn.c
--- external/bsd/libelf/dist/gelf_dyn.c 19 Dec 2009 06:39:29 -0000      1.2
+++ external/bsd/libelf/dist/gelf_dyn.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_dyn.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_dyn.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_ehdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_ehdr.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_ehdr.c
--- external/bsd/libelf/dist/gelf_ehdr.c        19 Dec 2009 06:39:29 -0000      
1.2
+++ external/bsd/libelf/dist/gelf_ehdr.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_ehdr.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_ehdr.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_fsize.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_fsize.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gelf_fsize.c
--- external/bsd/libelf/dist/gelf_fsize.c       19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/gelf_fsize.c       29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_fsize.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_fsize.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <gelf.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/gelf_getclass.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_getclass.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gelf_getclass.c
--- external/bsd/libelf/dist/gelf_getclass.c    19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/gelf_getclass.c    29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_getclass.c,v 1.1.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_getclass.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp 
$");
+#endif
 
 #include <gelf.h>
 
Index: external/bsd/libelf/dist/gelf_move.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_move.c,v
retrieving revision 1.3
diff -u -r1.3 gelf_move.c
--- external/bsd/libelf/dist/gelf_move.c        19 Dec 2009 07:31:04 -0000      
1.3
+++ external/bsd/libelf/dist/gelf_move.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_move.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_move.c,v 1.3 2009/12/19 07:31:04 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_phdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_phdr.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_phdr.c
--- external/bsd/libelf/dist/gelf_phdr.c        19 Dec 2009 06:39:29 -0000      
1.2
+++ external/bsd/libelf/dist/gelf_phdr.c        29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_phdr.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_phdr.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <gelf.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_rel.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_rel.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_rel.c
--- external/bsd/libelf/dist/gelf_rel.c 19 Dec 2009 06:39:29 -0000      1.2
+++ external/bsd/libelf/dist/gelf_rel.c 29 Dec 2009 02:31:46 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_rel.c,v 1.2.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_rel.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_rela.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_rela.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_rela.c
--- external/bsd/libelf/dist/gelf_rela.c        19 Dec 2009 06:39:29 -0000      
1.2
+++ external/bsd/libelf/dist/gelf_rela.c        29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_rela.c,v 1.2.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_rela.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_shdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_shdr.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_shdr.c
--- external/bsd/libelf/dist/gelf_shdr.c        19 Dec 2009 06:39:29 -0000      
1.2
+++ external/bsd/libelf/dist/gelf_shdr.c        29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_shdr.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_shdr.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_sym.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_sym.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_sym.c
--- external/bsd/libelf/dist/gelf_sym.c 19 Dec 2009 06:39:29 -0000      1.2
+++ external/bsd/libelf/dist/gelf_sym.c 29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_sym.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_sym.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_syminfo.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_syminfo.c,v
retrieving revision 1.3
diff -u -r1.3 gelf_syminfo.c
--- external/bsd/libelf/dist/gelf_syminfo.c     19 Dec 2009 07:31:04 -0000      
1.3
+++ external/bsd/libelf/dist/gelf_syminfo.c     29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_syminfo.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_syminfo.c,v 1.3 2009/12/19 07:31:04 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_symshndx.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_symshndx.c,v
retrieving revision 1.2
diff -u -r1.2 gelf_symshndx.c
--- external/bsd/libelf/dist/gelf_symshndx.c    19 Dec 2009 06:39:29 -0000      
1.2
+++ external/bsd/libelf/dist/gelf_symshndx.c    29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_symshndx.c,v 1.1.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_symshndx.c,v 1.2 2009/12/19 06:39:29 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <limits.h>
Index: external/bsd/libelf/dist/gelf_xlate.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/gelf_xlate.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gelf_xlate.c
--- external/bsd/libelf/dist/gelf_xlate.c       19 Dec 2009 05:43:40 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/gelf_xlate.c       29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/gelf_xlate.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: gelf_xlate.c,v 1.1.1.1 2009/12/19 05:43:40 thorpej Exp $");
+#endif
 
 #include <gelf.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/libelf.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf.c,v
retrieving revision 1.5
diff -u -r1.5 libelf.c
--- external/bsd/libelf/dist/libelf.c   20 Dec 2009 23:23:46 -0000      1.5
+++ external/bsd/libelf/dist/libelf.c   29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf.c,v 1.5 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <sys/param.h>
 
Index: external/bsd/libelf/dist/libelf.h
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf.h,v
retrieving revision 1.5
diff -u -r1.5 libelf.h
--- external/bsd/libelf/dist/libelf.h   21 Dec 2009 18:21:17 -0000      1.5
+++ external/bsd/libelf/dist/libelf.h   29 Dec 2009 02:31:47 -0000
@@ -42,6 +42,8 @@
 # define __LIBELF_HAVE_ELF_NOTE         1
 # define __LIBELF_HAVE_ELF_SYMINFO      1
 # define __LIBELF_HAVE_ELF_VERS         1
+# undef __unused
+# define __unused
 #elif defined(__NetBSD__)
 # include <sys/exec_elf.h>
 # define __LIBELF_HAVE_ELF_CAP         1
Index: external/bsd/libelf/dist/libelf_align.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_align.c,v
retrieving revision 1.3
diff -u -r1.3 libelf_align.c
--- external/bsd/libelf/dist/libelf_align.c     19 Dec 2009 07:54:32 -0000      
1.3
+++ external/bsd/libelf/dist/libelf_align.c     29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.3.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_align.c,v 1.3 2009/12/19 07:54:32 thorpej Exp $");
+#endif
 
 #include <sys/types.h>
 
Index: external/bsd/libelf/dist/libelf_allocate.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_allocate.c,v
retrieving revision 1.3
diff -u -r1.3 libelf_allocate.c
--- external/bsd/libelf/dist/libelf_allocate.c  19 Dec 2009 06:22:25 -0000      
1.3
+++ external/bsd/libelf/dist/libelf_allocate.c  29 Dec 2009 02:31:47 -0000
@@ -32,7 +32,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_allocate.c,v 1.3 2009/12/19 06:22:25 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <errno.h>
Index: external/bsd/libelf/dist/libelf_ar.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_ar.c,v
retrieving revision 1.3
diff -u -r1.3 libelf_ar.c
--- external/bsd/libelf/dist/libelf_ar.c        19 Dec 2009 07:59:24 -0000      
1.3
+++ external/bsd/libelf/dist/libelf_ar.c        29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_ar.c,v 1.3.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_ar.c,v 1.3 2009/12/19 07:59:24 thorpej Exp $");
+#endif
 
 #include <ar.h>
 #include <assert.h>
Index: external/bsd/libelf/dist/libelf_checksum.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_checksum.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 libelf_checksum.c
--- external/bsd/libelf/dist/libelf_checksum.c  19 Dec 2009 05:43:41 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/libelf_checksum.c  29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_checksum.c,v 1.2.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_checksum.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp 
$");
+#endif
 
 #include <gelf.h>
 
Index: external/bsd/libelf/dist/libelf_convert.m4
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_convert.m4,v
retrieving revision 1.7
diff -u -r1.7 libelf_convert.m4
--- external/bsd/libelf/dist/libelf_convert.m4  19 Dec 2009 08:47:46 -0000      
1.7
+++ external/bsd/libelf/dist/libelf_convert.m4  29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_convert.m4,v 1.4.2.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_convert.m4,v 1.7 2009/12/19 08:47:46 thorpej Exp $");
+#endif
 
 #include <sys/types.h>
 
Index: external/bsd/libelf/dist/libelf_data.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_data.c,v
retrieving revision 1.2
diff -u -r1.2 libelf_data.c
--- external/bsd/libelf/dist/libelf_data.c      19 Dec 2009 07:31:04 -0000      
1.2
+++ external/bsd/libelf/dist/libelf_data.c      29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.4.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_data.c,v 1.2 2009/12/19 07:31:04 thorpej Exp $");
+#endif
 
 #include <libelf.h>
 
Index: external/bsd/libelf/dist/libelf_ehdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_ehdr.c,v
retrieving revision 1.4
diff -u -r1.4 libelf_ehdr.c
--- external/bsd/libelf/dist/libelf_ehdr.c      20 Dec 2009 23:23:46 -0000      
1.4
+++ external/bsd/libelf/dist/libelf_ehdr.c      29 Dec 2009 02:31:47 -0000
@@ -30,7 +30,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_ehdr.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_ehdr.c,v 1.4 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <gelf.h>
Index: external/bsd/libelf/dist/libelf_extended.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_extended.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 libelf_extended.c
--- external/bsd/libelf/dist/libelf_extended.c  19 Dec 2009 05:43:41 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/libelf_extended.c  29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_extended.c,v 1.1.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_extended.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp 
$");
+#endif
 
 #include <assert.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/libelf_fsize.m4
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_fsize.m4,v
retrieving revision 1.3
diff -u -r1.3 libelf_fsize.m4
--- external/bsd/libelf/dist/libelf_fsize.m4    19 Dec 2009 07:31:44 -0000      
1.3
+++ external/bsd/libelf/dist/libelf_fsize.m4    29 Dec 2009 02:31:47 -0000
@@ -28,6 +28,11 @@
  * $FreeBSD: src/lib/libelf/libelf_fsize.m4,v 1.2.10.1.2.1 2009/10/25 01:10:29 
kensmith Exp $
  */
 
+#include <sys/cdefs.h>
+#if defined(__RCSID)
+__RCSID("$NetBSD$");
+#endif
+
 #include <libelf.h>
 
 #include "_libelf.h"
Index: external/bsd/libelf/dist/libelf_msize.m4
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_msize.m4,v
retrieving revision 1.4
diff -u -r1.4 libelf_msize.m4
--- external/bsd/libelf/dist/libelf_msize.m4    19 Dec 2009 07:33:06 -0000      
1.4
+++ external/bsd/libelf/dist/libelf_msize.m4    29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_msize.m4,v 1.2.10.1.2.1 
2009/10/25 01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_msize.m4,v 1.4 2009/12/19 07:33:06 thorpej Exp $");
+#endif
 
 #include <sys/types.h>
 
Index: external/bsd/libelf/dist/libelf_phdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_phdr.c,v
retrieving revision 1.2
diff -u -r1.2 libelf_phdr.c
--- external/bsd/libelf/dist/libelf_phdr.c      20 Dec 2009 23:23:46 -0000      
1.2
+++ external/bsd/libelf/dist/libelf_phdr.c      29 Dec 2009 02:31:47 -0000
@@ -30,7 +30,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_phdr.c,v 1.2.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_phdr.c,v 1.2 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <gelf.h>
Index: external/bsd/libelf/dist/libelf_shdr.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_shdr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 libelf_shdr.c
--- external/bsd/libelf/dist/libelf_shdr.c      19 Dec 2009 05:43:41 -0000      
1.1.1.1
+++ external/bsd/libelf/dist/libelf_shdr.c      29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_shdr.c,v 1.1.10.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_shdr.c,v 1.1.1.1 2009/12/19 05:43:41 thorpej Exp $");
+#endif
 
 #include <gelf.h>
 #include <libelf.h>
Index: external/bsd/libelf/dist/libelf_xlate.c
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/dist/libelf_xlate.c,v
retrieving revision 1.2
diff -u -r1.2 libelf_xlate.c
--- external/bsd/libelf/dist/libelf_xlate.c     20 Dec 2009 23:23:46 -0000      
1.2
+++ external/bsd/libelf/dist/libelf_xlate.c     29 Dec 2009 02:31:47 -0000
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libelf/libelf_xlate.c,v 1.3.2.1.2.1 2009/10/25 
01:10:29 kensmith Exp $"); */
+#if defined(__RCSID)
 __RCSID("$NetBSD: libelf_xlate.c,v 1.2 2009/12/20 23:23:46 thorpej Exp $");
+#endif
 
 #include <assert.h>
 #include <libelf.h>


---
Izumi Tsutsui
Follow-Ups:
- Re: __RCSID() in tools/libelf (Re: CVS commit: src)
  - From: Christos Zoulas
- Re: __RCSID() in tools/libelf (Re: CVS commit: src)
  - From: Jason Thorpe
- Re: __RCSID() in tools/libelf (Re: CVS commit: src)
  - From: Jason Thorpe
References:
- __RCSID() in tools/libelf (Re: CVS commit: src)
  - From: Izumi Tsutsui
Prev by Date: __RCSID() in tools/libelf (Re: CVS commit: src)
Next by Date: Re: __RCSID() in tools/libelf (Re: CVS commit: src)
Previous by Thread: __RCSID() in tools/libelf (Re: CVS commit: src)
Next by Thread: Re: __RCSID() in tools/libelf (Re: CVS commit: src)
Indexes:
Home | Main Index | Thread Index | Old Index