Date: Wed, 15 Jan 2014 22:35:55 +0000 (UTC) From: Kai Wang <kaiw@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260698 - projects/elftoolchain/lib/libelf Message-ID: <201401152235.s0FMZt8k059984@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kaiw Date: Wed Jan 15 22:35:55 2014 New Revision: 260698 URL: http://svnweb.freebsd.org/changeset/base/260698 Log: Removed source code for the old libelf and build the new libelf from contrib/ instead. Deleted: projects/elftoolchain/lib/libelf/README projects/elftoolchain/lib/libelf/Version.map projects/elftoolchain/lib/libelf/_libelf.h projects/elftoolchain/lib/libelf/elf.3 projects/elftoolchain/lib/libelf/elf_begin.3 projects/elftoolchain/lib/libelf/elf_begin.c projects/elftoolchain/lib/libelf/elf_cntl.3 projects/elftoolchain/lib/libelf/elf_cntl.c projects/elftoolchain/lib/libelf/elf_data.c projects/elftoolchain/lib/libelf/elf_end.3 projects/elftoolchain/lib/libelf/elf_end.c projects/elftoolchain/lib/libelf/elf_errmsg.3 projects/elftoolchain/lib/libelf/elf_errmsg.c projects/elftoolchain/lib/libelf/elf_errno.c projects/elftoolchain/lib/libelf/elf_fill.3 projects/elftoolchain/lib/libelf/elf_fill.c projects/elftoolchain/lib/libelf/elf_flag.c projects/elftoolchain/lib/libelf/elf_flagdata.3 projects/elftoolchain/lib/libelf/elf_getarhdr.3 projects/elftoolchain/lib/libelf/elf_getarhdr.c projects/elftoolchain/lib/libelf/elf_getarsym.3 projects/elftoolchain/lib/libelf/elf_getarsym.c projects/elftoolchain/lib/libelf/elf_getbase.3 projects/elftoolchain/lib/libelf/elf_getbase.c projects/elftoolchain/lib/libelf/elf_getdata.3 projects/elftoolchain/lib/libelf/elf_getident.3 projects/elftoolchain/lib/libelf/elf_getident.c projects/elftoolchain/lib/libelf/elf_getphdrnum.3 projects/elftoolchain/lib/libelf/elf_getphnum.3 projects/elftoolchain/lib/libelf/elf_getscn.3 projects/elftoolchain/lib/libelf/elf_getshdrnum.3 projects/elftoolchain/lib/libelf/elf_getshdrstrndx.3 projects/elftoolchain/lib/libelf/elf_getshnum.3 projects/elftoolchain/lib/libelf/elf_getshstrndx.3 projects/elftoolchain/lib/libelf/elf_hash.3 projects/elftoolchain/lib/libelf/elf_hash.c projects/elftoolchain/lib/libelf/elf_kind.3 projects/elftoolchain/lib/libelf/elf_kind.c projects/elftoolchain/lib/libelf/elf_memory.3 projects/elftoolchain/lib/libelf/elf_memory.c projects/elftoolchain/lib/libelf/elf_next.3 projects/elftoolchain/lib/libelf/elf_next.c projects/elftoolchain/lib/libelf/elf_phnum.c projects/elftoolchain/lib/libelf/elf_rand.3 projects/elftoolchain/lib/libelf/elf_rand.c projects/elftoolchain/lib/libelf/elf_rawfile.3 projects/elftoolchain/lib/libelf/elf_rawfile.c projects/elftoolchain/lib/libelf/elf_scn.c projects/elftoolchain/lib/libelf/elf_shnum.c projects/elftoolchain/lib/libelf/elf_shstrndx.c projects/elftoolchain/lib/libelf/elf_strptr.3 projects/elftoolchain/lib/libelf/elf_strptr.c projects/elftoolchain/lib/libelf/elf_types.m4 projects/elftoolchain/lib/libelf/elf_update.3 projects/elftoolchain/lib/libelf/elf_update.c projects/elftoolchain/lib/libelf/elf_version.3 projects/elftoolchain/lib/libelf/elf_version.c projects/elftoolchain/lib/libelf/gelf.3 projects/elftoolchain/lib/libelf/gelf.h projects/elftoolchain/lib/libelf/gelf_cap.c projects/elftoolchain/lib/libelf/gelf_checksum.3 projects/elftoolchain/lib/libelf/gelf_checksum.c projects/elftoolchain/lib/libelf/gelf_dyn.c projects/elftoolchain/lib/libelf/gelf_ehdr.c projects/elftoolchain/lib/libelf/gelf_fsize.3 projects/elftoolchain/lib/libelf/gelf_fsize.c projects/elftoolchain/lib/libelf/gelf_getcap.3 projects/elftoolchain/lib/libelf/gelf_getclass.3 projects/elftoolchain/lib/libelf/gelf_getclass.c projects/elftoolchain/lib/libelf/gelf_getdyn.3 projects/elftoolchain/lib/libelf/gelf_getehdr.3 projects/elftoolchain/lib/libelf/gelf_getmove.3 projects/elftoolchain/lib/libelf/gelf_getphdr.3 projects/elftoolchain/lib/libelf/gelf_getrel.3 projects/elftoolchain/lib/libelf/gelf_getrela.3 projects/elftoolchain/lib/libelf/gelf_getshdr.3 projects/elftoolchain/lib/libelf/gelf_getsym.3 projects/elftoolchain/lib/libelf/gelf_getsyminfo.3 projects/elftoolchain/lib/libelf/gelf_getsymshndx.3 projects/elftoolchain/lib/libelf/gelf_move.c projects/elftoolchain/lib/libelf/gelf_newehdr.3 projects/elftoolchain/lib/libelf/gelf_newphdr.3 projects/elftoolchain/lib/libelf/gelf_phdr.c projects/elftoolchain/lib/libelf/gelf_rel.c projects/elftoolchain/lib/libelf/gelf_rela.c projects/elftoolchain/lib/libelf/gelf_shdr.c projects/elftoolchain/lib/libelf/gelf_sym.c projects/elftoolchain/lib/libelf/gelf_syminfo.c projects/elftoolchain/lib/libelf/gelf_symshndx.c projects/elftoolchain/lib/libelf/gelf_update_ehdr.3 projects/elftoolchain/lib/libelf/gelf_xlate.c projects/elftoolchain/lib/libelf/gelf_xlatetof.3 projects/elftoolchain/lib/libelf/libelf.c projects/elftoolchain/lib/libelf/libelf.h projects/elftoolchain/lib/libelf/libelf_align.c projects/elftoolchain/lib/libelf/libelf_allocate.c projects/elftoolchain/lib/libelf/libelf_ar.c projects/elftoolchain/lib/libelf/libelf_ar_util.c projects/elftoolchain/lib/libelf/libelf_checksum.c projects/elftoolchain/lib/libelf/libelf_convert.m4 projects/elftoolchain/lib/libelf/libelf_data.c projects/elftoolchain/lib/libelf/libelf_ehdr.c projects/elftoolchain/lib/libelf/libelf_extended.c projects/elftoolchain/lib/libelf/libelf_fsize.m4 projects/elftoolchain/lib/libelf/libelf_msize.m4 projects/elftoolchain/lib/libelf/libelf_phdr.c projects/elftoolchain/lib/libelf/libelf_shdr.c projects/elftoolchain/lib/libelf/libelf_xlate.c Modified: projects/elftoolchain/lib/libelf/Makefile Modified: projects/elftoolchain/lib/libelf/Makefile ============================================================================== --- projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:30:48 2014 (r260697) +++ projects/elftoolchain/lib/libelf/Makefile Wed Jan 15 22:35:55 2014 (r260698) @@ -1,8 +1,19 @@ # $FreeBSD$ +.include <bsd.own.mk> + +TOP= ${.CURDIR}/../../contrib/elftoolchain +SRCDIR= ${TOP}/libelf + +CFLAGS+= -I. # OBJDIR +CFLAGS+= -I${SRCDIR} # Sources +CFLAGS+= -I${TOP}/common # common code + +.PATH: ${SRCDIR} LIB= elf -SRCS= elf_begin.c \ +SRCS= elf.c \ + elf_begin.c \ elf_cntl.c \ elf_end.c elf_errmsg.c elf_errno.c \ elf_data.c \ @@ -16,6 +27,7 @@ SRCS= elf_begin.c \ elf_kind.c \ elf_memory.c \ elf_next.c \ + elf_open.c \ elf_rand.c \ elf_rawfile.c \ elf_phnum.c \ @@ -40,7 +52,6 @@ SRCS= elf_begin.c \ gelf_syminfo.c \ gelf_symshndx.c \ gelf_xlate.c \ - libelf.c \ libelf_align.c \ libelf_allocate.c \ libelf_ar.c \ @@ -49,28 +60,18 @@ SRCS= elf_begin.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 \ ${GENSRCS} -INCS= libelf.h gelf.h -# -# We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes -# problems when a header file in sys depends on a file in another -# part of the tree, e.g. a machine dependent header. -# -SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h +INCS= libelf.h gelf.h +INCSDIR= /usr/include GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} -CLEANDIRS= sys -CFLAGS+= -I${.CURDIR} -I. - -sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} - mkdir -p ${.OBJDIR}/sys - ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} SHLIB_MAJOR= 1 @@ -97,6 +98,7 @@ MAN= elf.3 \ elf_kind.3 \ elf_memory.3 \ elf_next.3 \ + elf_open.3 \ elf_rawfile.3 \ elf_rand.3 \ elf_strptr.3 \ @@ -124,6 +126,7 @@ MAN= elf.3 \ MLINKS+= \ elf_errmsg.3 elf_errno.3 \ + elf_flagdata.3 elf_flagarhdr.3 \ elf_flagdata.3 elf_flagehdr.3 \ elf_flagdata.3 elf_flagelf.3 \ elf_flagdata.3 elf_flagphdr.3 \ @@ -135,6 +138,7 @@ MLINKS+= \ elf_getscn.3 elf_newscn.3 \ elf_getscn.3 elf_nextscn.3 \ elf_getshstrndx.3 elf_setshstrndx.3 \ + elf_open.3 elf_openmemory.3 \ gelf_getcap.3 gelf_update_cap.3 \ gelf_getdyn.3 gelf_update_dyn.3 \ gelf_getmove.3 gelf_update_move.3 \ @@ -160,12 +164,7 @@ MLINKS+= \ gelf_xlatetof.3 elf${E}_xlatetom.3 .endfor -VERSION_MAP= ${.CURDIR}/Version.map - -LIBELF_TEST_HOOKS?= 1 -.if defined(LIBELF_TEST_HOOKS) && (${LIBELF_TEST_HOOKS} > 0) -CFLAGS+= -DLIBELF_TEST_HOOKS -.endif +VERSION_MAP= ${SRCDIR}/Version.map libelf_convert.c: elf_types.m4 libelf_convert.m4 libelf_fsize.c: elf_types.m4 libelf_fsize.m4 @@ -176,4 +175,5 @@ libelf_msize.c: elf_types.m4 libelf_msi # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: - m4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET} + m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401152235.s0FMZt8k059984>