[src/trunk]: src/external/bsd/elftoolchain/dist make this tools friendly.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0559d4f94074
branches:  trunk
changeset: 340762:0559d4f94074
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 29 19:43:39 2015 +0000

description:
make this tools friendly.

diffstat:

 external/bsd/elftoolchain/dist/common/_elftc.h         |   6 +++++-
 external/bsd/elftoolchain/dist/libelf/_libelf_config.h |   6 +++---
 external/bsd/elftoolchain/dist/libelf/libelf.h         |  16 ++++++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r 89c851ca704f -r 0559d4f94074 external/bsd/elftoolchain/dist/common/_elftc.h
--- a/external/bsd/elftoolchain/dist/common/_elftc.h    Tue Sep 29 15:12:52 2015 +0000
+++ b/external/bsd/elftoolchain/dist/common/_elftc.h    Tue Sep 29 19:43:39 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _elftc.h,v 1.2 2014/03/09 16:58:03 christos Exp $      */
+/*     $NetBSD: _elftc.h,v 1.3 2015/09/29 19:43:39 christos Exp $      */
 
 /*-
  * Copyright (c) 2009 Joseph Koshy
@@ -317,6 +317,10 @@
 #endif /* __GNUC__ */
 #endif
 
+#ifndef ELFTC_VCSID
+#define        ELFTC_VCSID(ID)         /**/
+#endif
+
 #endif /* ELFTC_VCSID */
 
 /*
diff -r 89c851ca704f -r 0559d4f94074 external/bsd/elftoolchain/dist/libelf/_libelf_config.h
--- a/external/bsd/elftoolchain/dist/libelf/_libelf_config.h    Tue Sep 29 15:12:52 2015 +0000
+++ b/external/bsd/elftoolchain/dist/libelf/_libelf_config.h    Tue Sep 29 19:43:39 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: _libelf_config.h,v 1.2 2014/03/09 16:58:04 christos Exp $      */
+/*     $NetBSD: _libelf_config.h,v 1.3 2015/09/29 19:43:39 christos Exp $      */
 
 /*-
  * Copyright (c) 2008-2011 Joseph Koshy
@@ -115,7 +115,7 @@
 
 #endif /* __minix */
 
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(HAVE_NBTOOL_CONFIG_H)
 
 #include <machine/elf_machdep.h>
 
@@ -135,7 +135,7 @@
 #define        Elf_Note                Elf64_Nhdr
 #endif
 
-#endif /* __NetBSD__ */
+#endif /* __NetBSD__ || HAVE_NBTOOL_CONFIG_H */
 
 #if defined(__OpenBSD__)
 
diff -r 89c851ca704f -r 0559d4f94074 external/bsd/elftoolchain/dist/libelf/libelf.h
--- a/external/bsd/elftoolchain/dist/libelf/libelf.h    Tue Sep 29 15:12:52 2015 +0000
+++ b/external/bsd/elftoolchain/dist/libelf/libelf.h    Tue Sep 29 19:43:39 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libelf.h,v 1.2 2014/03/09 16:58:04 christos Exp $      */
+/*     $NetBSD: libelf.h,v 1.3 2015/09/29 19:43:39 christos Exp $      */
 
 /*-
  * Copyright (c) 2006,2008-2010 Joseph Koshy
@@ -35,12 +35,16 @@
 # include "nbtool_config.h"
 #endif
 
-#include <sys/types.h>
-#ifdef __NetBSD__
-#include <sys/exec_elf.h>
+
+#if HAVE_NBTOOL_CONFIG_H
+# include <nbinclude/sys/exec_elf.h>
+#elif defined(__NetBSD__)
+# include <sys/exec_elf.h>
+#elif defined(__FreeBSD__)
+# include <sys/elf32.h>
+# include <sys/elf64.h>
 #else
-#include <sys/elf32.h>
-#include <sys/elf64.h>
+# error "Unsupported platform"
 #endif
 
 /* Library private data structures */