From 482608c0a54777176a377f8a0b1d05be9ffdf644 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 9 Mar 2014 17:10:12 +0000
Subject: [PATCH] switch to the new libelf

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

diff --git a/tools/libelf/Makefile b/tools/libelf/Makefile
index fed02c0d5a05..60c06c4b5dce 100644
--- a/tools/libelf/Makefile
+++ b/tools/libelf/Makefile
@@ -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 @@ SRCS=		elf_begin.c						\
 		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 @@ SRCS=		elf_begin.c						\
 
 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 --git a/tools/libelf/libelf.inc b/tools/libelf/libelf.inc
index fa876782eab1..5af366965b96 100644
--- a/tools/libelf/libelf.inc
+++ b/tools/libelf/libelf.inc
@@ -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}