[src/trunk]: src/tools/libelf switch to the new libelf

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

details:   https://anonhg.NetBSD.org/src/rev/c9f53b46a46b
branches:  trunk
changeset: 794238:c9f53b46a46b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 09 17:10:12 2014 +0000

description:
switch to the new libelf

diffstat:

 tools/libelf/Makefile   |  11 +++++++----
 tools/libelf/libelf.inc |   4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 1c49521400f9 -r c9f53b46a46b tools/libelf/Makefile
--- a/tools/libelf/Makefile     Sun Mar 09 17:09:20 2014 +0000
+++ b/tools/libelf/Makefile     Sun Mar 09 17:10:12 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2012/12/16 06:47:39 apb Exp $
+#      $NetBSD: Makefile,v 1.8 2014/03/09 17:10:12 christos Exp $
 
 HOSTLIB=       elf
 
@@ -31,11 +31,14 @@
                gelf_rel.c gelf_rela.c                                  \
                gelf_shdr.c gelf_sym.c gelf_syminfo.c gelf_symshndx.c   \
                gelf_xlate.c                                            \
-               libelf.c                                                \
+               elf.c                                                   \
                libelf_align.c libelf_allocate.c libelf_ar.c            \
+               libelf_ar_util.c                                        \
                libelf_checksum.c                                       \
                libelf_data.c                                           \
                libelf_ehdr.c libelf_extended.c                         \
+               libelf_memory.c                                         \
+               libelf_open.c                                           \
                libelf_phdr.c                                           \
                libelf_shdr.c                                           \
                libelf_xlate.c                                          \
@@ -43,10 +46,10 @@
 
 LIBELF_GENSRCS=        libelf_fsize.c libelf_msize.c libelf_convert.c
 
-LIBELF_DIR=    ${.CURDIR}/../../external/bsd/libelf/dist
+LIBELF_DIR=    ${.CURDIR}/../../external/bsd/elftoolchain/dist/libelf
 
 CLEANFILES+=   ${LIBELF_GENSRCS}
-CPPFLAGS+=     -I${.CURDIR}/../compat -I${LIBELF_DIR}
+CPPFLAGS+=     -I${.CURDIR}/../compat -I${LIBELF_DIR} -I${LIBELF_DIR}/../common
 CPPFLAGS+=     -I${TOOLDIR}/include/nbinclude
 
 CPPFLAGS+=     -DLIBELF_TEST_HOOKS
diff -r 1c49521400f9 -r c9f53b46a46b tools/libelf/libelf.inc
--- a/tools/libelf/libelf.inc   Sun Mar 09 17:09:20 2014 +0000
+++ b/tools/libelf/libelf.inc   Sun Mar 09 17:10:12 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: libelf.inc,v 1.1 2009/12/21 18:21:18 thorpej Exp $
+#      $NetBSD: libelf.inc,v 1.2 2014/03/09 17:10:12 christos Exp $
 
-LIBELFSRCDIR=  ${.CURDIR}/../../external/bsd/libelf/dist
+LIBELFSRCDIR=  ${.CURDIR}/../../external/bsd/elftoolchain/dist/libelf
 LIBELFOBJDIR!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}