svn commit: r295581 - in head: . lib lib/libpe share/mk

[Ed Maste]

Author: emaste
Date: Fri Feb 12 21:12:47 2016
New Revision: 295581
URL: https://svnweb.freebsd.org/changeset/base/295581

Log:
  Add libpe for elfcopy(1) PE/COFF support
  
  Sponsored by:	The FreeBSD Foundation

Added:
  head/lib/libpe/
  head/lib/libpe/Makefile   (contents, props changed)
Modified:
  head/Makefile.inc1
  head/lib/Makefile
  head/share/mk/src.libnames.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Feb 12 21:06:48 2016	(r295580)
+++ head/Makefile.inc1	Fri Feb 12 21:12:47 2016	(r295581)
@@ -1638,6 +1638,7 @@ _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
@@ -1650,6 +1651,7 @@ _elftctools+=	usr.bin/addr2line
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy
 .endif
 

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Fri Feb 12 21:06:48 2016	(r295580)
+++ head/lib/Makefile	Fri Feb 12 21:12:47 2016	(r295581)
@@ -80,6 +80,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libopie \
 	libpam \
 	libpcap \
+	${_libpe} \
 	libpjdlog \
 	${_libpmc} \
 	${_libproc} \
@@ -184,6 +185,7 @@ _cuse=		libcuse
 
 .if ${MK_TOOLCHAIN} != "no"
 _libelftc=	libelftc
+_libpe=		libpe
 .endif
 
 .if ${MK_FILE} != "no"

Added: head/lib/libpe/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libpe/Makefile	Fri Feb 12 21:12:47 2016	(r295581)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+.include <bsd.own.mk>
+
+INTERNALLIB=
+
+ELFTCDIR=	${.CURDIR}/../../contrib/elftoolchain
+
+.PATH:	${ELFTCDIR}/libpe
+
+LIB=	pe
+
+SRCS=	libpe_buffer.c \
+	libpe_coff.c \
+	libpe_dos.c \
+	libpe_init.c \
+	libpe_rich.c \
+	libpe_section.c \
+	libpe_utils.c \
+	pe_buffer.c \
+	pe_cntl.c \
+	pe_coff.c \
+	pe_dos.c \
+	pe_flag.c \
+	pe_init.c \
+	pe_rich.c \
+	pe_section.c \
+	pe_symtab.c \
+	pe_update.c
+
+CFLAGS+=-I${ELFTCDIR}/libpe -I${ELFTCDIR}/common
+
+MAN=
+
+.include <bsd.lib.mk>

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Fri Feb 12 21:06:48 2016	(r295580)
+++ head/share/mk/src.libnames.mk	Fri Feb 12 21:12:47 2016	(r295581)
@@ -39,6 +39,7 @@ _INTERNALLIBS=	\
 		openbsd \
 		opts \
 		parse \
+		pe \
 		readline \
 		sl \
 		sm \
@@ -367,6 +368,9 @@ LDADD+=		${LDADD_${_l}}
 LIBELFTCDIR=	${OBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 
+LIBPEDIR=	${OBJTOP}/lib/libpe
+LIBPE?=		${LIBPEDIR}/libpe.a
+
 LIBREADLINEDIR=	${OBJTOP}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a