Module Name: src
Committed By: christos
Date: Tue Sep 29 19:43:39 UTC 2015
Modified Files:
src/external/bsd/elftoolchain/dist/common: _elftc.h
src/external/bsd/elftoolchain/dist/libelf: _libelf_config.h libelf.h
Log Message:
make this tools friendly.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/elftoolchain/dist/common/_elftc.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h \
src/external/bsd/elftoolchain/dist/libelf/libelf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftoolchain/dist/common/_elftc.h
diff -u src/external/bsd/elftoolchain/dist/common/_elftc.h:1.2 src/external/bsd/elftoolchain/dist/common/_elftc.h:1.3
--- src/external/bsd/elftoolchain/dist/common/_elftc.h:1.2 Sun Mar 9 12:58:03 2014
+++ src/external/bsd/elftoolchain/dist/common/_elftc.h Tue Sep 29 15:43:39 2015
@@ -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 @@ struct name { \
#endif /* __GNUC__ */
#endif
+#ifndef ELFTC_VCSID
+#define ELFTC_VCSID(ID) /**/
+#endif
+
#endif /* ELFTC_VCSID */
/*
Index: src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h
diff -u src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.2 src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.3
--- src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.2 Sun Mar 9 12:58:04 2014
+++ src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h Tue Sep 29 15:43:39 2015
@@ -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__)
Index: src/external/bsd/elftoolchain/dist/libelf/libelf.h
diff -u src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.2 src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.3
--- src/external/bsd/elftoolchain/dist/libelf/libelf.h:1.2 Sun Mar 9 12:58:04 2014
+++ src/external/bsd/elftoolchain/dist/libelf/libelf.h Tue Sep 29 15:43:39 2015
@@ -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 */
