This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH] Let libelf.h's loff_t fall back to off_t
- From: Josh Stone <jistone at redhat dot com>
- To: elfutils-devel at lists dot fedorahosted dot org
- Date: Fri, 09 Oct 2015 12:13:05 -0700
- Subject: [PATCH] Let libelf.h's loff_t fall back to off_t
Some systems don't have loff_t, like FreeBSD where off_t always supports
large files. We can use AC_CHECK_TYPE to support this, with an AC_SUBST
to create a libelf.h specialized for the target system.
Signed-off-by: Josh Stone <jistone@redhat.com>
---
ChangeLog | 7 +
backends/ChangeLog | 4 +
backends/Makefile.am | 3 +-
configure.ac | 10 +-
lib/ChangeLog | 4 +
lib/Makefile.am | 2 +-
libasm/ChangeLog | 4 +
libasm/Makefile.am | 3 +-
libcpu/ChangeLog | 4 +
libcpu/Makefile.am | 3 +-
libdw/ChangeLog | 4 +
libdw/Makefile.am | 2 +-
libdwelf/ChangeLog | 4 +
libdwelf/Makefile.am | 3 +-
libdwfl/ChangeLog | 4 +
libdwfl/Makefile.am | 3 +-
libebl/ChangeLog | 4 +
libebl/Makefile.am | 3 +-
libelf/ChangeLog | 5 +
libelf/libelf.h | 396 ---------------------------------------------------
libelf/libelf.h.in | 396 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/ChangeLog | 4 +
src/Makefile.am | 3 +-
tests/ChangeLog | 4 +
tests/Makefile.am | 2 +-
25 files changed, 473 insertions(+), 408 deletions(-)
delete mode 100644 libelf/libelf.h
create mode 100644 libelf/libelf.h.in
diff --git a/ChangeLog b/ChangeLog
index b7e69e091e49..33145418550a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * configure.ac (AC_CONFIG_SRCDIR): Use renamed libelf.h.in.
+ (AC_CONFIG_FILES): Add libelf/libelf.h.
+ (AC_SUBST([loff_t])): New substitution for libelf.h.in.
+ (AC_CHECK_TYPE([loff_t])): Look for loff_t; fallback to off_t.
+
2015-09-24 Jose E. Marchesi <jose.marchesi@oracle.com>
* configure.ac: Use -fPIC instead of -fpic to avoid relocation
diff --git a/backends/ChangeLog b/backends/ChangeLog
index e6f376336eff..2b83c6aec4c6 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/libelf.
+
2015-10-05 Josh Stone <jistone@redhat.com>
* Makefile.am (libebl_%.so): Add AM_V_at and AM_V_CCLD silencers.
diff --git a/backends/Makefile.am b/backends/Makefile.am
index f7002fb56964..07a26171ad1c 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -29,7 +29,8 @@
## not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/config/eu.am
AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
- -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
+ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+ -I$(top_builddir)/libelf
modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
diff --git a/configure.ac b/configure.ac
index fe2795e36dcd..9006a76bc915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ dnl We use GNU make extensions; automake 1.10 defaults to -Wportability.
AM_INIT_AUTOMAKE([gnits 1.11 -Wno-portability dist-bzip2 no-dist-gzip parallel-tests])
AM_MAINTAINER_MODE
-AC_CONFIG_SRCDIR([libelf/libelf.h])
+AC_CONFIG_SRCDIR([libelf/libelf.h.in])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_HEADERS([config.h])
@@ -313,7 +313,7 @@ dnl Support library.
AC_CONFIG_FILES([lib/Makefile])
dnl ELF library.
-AC_CONFIG_FILES([libelf/Makefile])
+AC_CONFIG_FILES([libelf/Makefile libelf/libelf.h])
dnl Higher-level ELF support library.
AC_CONFIG_FILES([libebl/Makefile])
@@ -398,6 +398,12 @@ AH_TEMPLATE([MODVERSION], [Identifier for modules in the build.])
AC_CHECK_SIZEOF(long)
+# Need a long offset type for public headers, independent of AC_SYS_LARGEFILE.
+# Use loff_t where it exists, else hope off_t suffices (like on FreeBSD).
+# (CC will raise an error if LFSed implementations don't match the header.)
+AC_SUBST(loff_t)
+AC_CHECK_TYPE([loff_t], [loff_t=loff_t], [loff_t=off_t])
+
# On aarch64 before glibc 2.20 we would get the kernel user_pt_regs instead
# of the user_regs_struct from sys/user.h. They are structurally the same
# but we get either one or the other.
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 76b5753d71cc..a6fc67494754 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
2015-09-24 Jose E. Marchesi <jose.marchesi@oracle.com>
* Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid relocation
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2219eaa4eb7b..3600943fa7e4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,7 @@
##
include $(top_srcdir)/config/eu.am
AM_CFLAGS += -fPIC
-AM_CPPFLAGS += -I$(srcdir)/../libelf
+AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(builddir)/../libelf
noinst_LIBRARIES = libeu.a
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index beb6211c5894..c1ca7ff7a89b 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/libelf.
+
2015-10-05 Josh Stone <jistone@redhat.com>
* Makefile.am (libasm.so): Add AM_V_CCLD and AM_V_at silencers.
diff --git a/libasm/Makefile.am b/libasm/Makefile.am
index a4bf293a4806..f5145e6e0d73 100644
--- a/libasm/Makefile.am
+++ b/libasm/Makefile.am
@@ -28,7 +28,8 @@
## not, see <http://www.gnu.org/licenses/>.
##
include $(top_srcdir)/config/eu.am
-AM_CPPFLAGS += -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw
+AM_CPPFLAGS += -I$(top_srcdir)/libelf -I$(top_builddir)/libelf \
+ -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw
GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
VERSION = 1
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index c953c7b385ec..d6d78b3acfd5 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
2015-10-05 Josh Stone <jistone@redhat.com>
* Makefile.am (%_defs): Add AM_V_GEN and AM_V_at silencers.
diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
index f0caaea6e97a..e8b861b085f3 100644
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -29,7 +29,8 @@
##
include $(top_srcdir)/config/eu.am
AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libasm
+ -I$(srcdir)/../libdw -I$(srcdir)/../libasm \
+ -I$(builddir)/../libelf
AM_CFLAGS += -fPIC -fdollars-in-identifiers
LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=)
LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 39c49aa48b86..5fa159611d5c 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,9 @@
2015-10-09 Josh Stone <jistone@redhat.com>
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
+2015-10-09 Josh Stone <jistone@redhat.com>
+
* dwarf_begin.c (dwarf_begin): Replace stat64 and fstat64 with stat
and fstat.
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 2da0db677de0..736d30b23cfe 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -31,7 +31,7 @@ include $(top_srcdir)/config/eu.am
if BUILD_STATIC
AM_CFLAGS += -fPIC
endif
-AM_CPPFLAGS += -I$(srcdir)/../libelf
+AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(builddir)/../libelf
VERSION = 1
lib_LIBRARIES = libdw.a
diff --git a/libdwelf/ChangeLog b/libdwelf/ChangeLog
index 342cb9cfe127..e8b92f387e1b 100644
--- a/libdwelf/ChangeLog
+++ b/libdwelf/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
2014-11-14 Mark Wielaard <mjw@redhat.com>
* dwelf_elf_gnu_debuglink.c (dwelf_elf_gnu_debuglink): Check d_buf
diff --git a/libdwelf/Makefile.am b/libdwelf/Makefile.am
index cd4b7ddf53f5..05f2828b7506 100644
--- a/libdwelf/Makefile.am
+++ b/libdwelf/Makefile.am
@@ -31,7 +31,8 @@
##
include $(top_srcdir)/config/eu.am
AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- -I$(srcdir)/../libdwfl -I$(srcdir)/../libebl
+ -I$(srcdir)/../libdwfl -I$(srcdir)/../libebl \
+ -I$(builddir)/../libelf
VERSION = 1
noinst_LIBRARIES = libdwelf.a libdwelf_pic.a
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 5cae434ec449..8863140db1c3 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,9 @@
2015-10-09 Josh Stone <jistone@redhat.com>
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
+2015-10-09 Josh Stone <jistone@redhat.com>
+
* core-file.c (elf_begin_rand): Replace loff_t with off_t.
* open.c (decompress): Replace off64_t with off_t.
* gzip.c (unzip): Likewise.
diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am
index 72c980bfe498..ae1e523e0c65 100644
--- a/libdwfl/Makefile.am
+++ b/libdwfl/Makefile.am
@@ -31,7 +31,8 @@
##
include $(top_srcdir)/config/eu.am
AM_CPPFLAGS += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf
+ -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
+ -I$(builddir)/../libelf
VERSION = 1
noinst_LIBRARIES = libdwfl.a
diff --git a/libebl/ChangeLog b/libebl/ChangeLog
index d040c08fe17a..488ff75b1924 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-09 Josh Stone <jistone@redhat.com>
+
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
2015-09-24 Jose E. Marchesi <jose.marchesi@oracle.com>
* Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid
diff --git a/libebl/Makefile.am b/libebl/Makefile.am
index 6b41a3e1c701..f2bece0133b8 100644
--- a/libebl/Makefile.am
+++ b/libebl/Makefile.am
@@ -29,7 +29,8 @@
##
include $(top_srcdir)/config/eu.am
AM_CFLAGS += -fPIC
-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw -I$(srcdir)/../libasm
+AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(builddir)/../libelf \
+ -I$(srcdir)/../libdw -I$(srcdir)/../libasm
VERSION = 1
LIBEBL_SUBDIR = @LIBEBL_SUBDIR@
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index b1d1ecdf11e5..b3fca63968df 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,5 +1,10 @@
2015-10-09 Josh Stone <jistone@redhat.com>
+ * libelf.h: Renamed to ...
+ * libelf.h.in: ... here, with @loff_t@ for AC_SUBST.
+
+2015-10-09 Josh Stone <jistone@redhat.com>
+
* libelfP.h (struct Elf): Replace off64_t with off_t.
* elf_getdata_rawchunk.c (elf_getdata_rawchunk): Likewise.
diff --git a/libelf/libelf.h b/libelf/libelf.h
deleted file mode 100644
index 5a2b3af856e0..000000000000
--- a/libelf/libelf.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/* Interface for libelf.
- Copyright (C) 1998-2010 Red Hat, Inc.
- This file is part of elfutils.
-
- This file is free software; you can redistribute it and/or modify
- it under the terms of either
-
- * the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at
- your option) any later version
-
- or
-
- * the GNU General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at
- your option) any later version
-
- or both in parallel, as here.
-
- elfutils is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received copies of the GNU General Public License and
- the GNU Lesser General Public License along with this program. If
- not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef _LIBELF_H
-#define _LIBELF_H 1
-
-#include <sys/types.h>
-
-/* Get the ELF types. */
-#include <elf.h>
-
-
-/* Known translation types. */
-typedef enum
-{
- ELF_T_BYTE, /* unsigned char */
- ELF_T_ADDR, /* Elf32_Addr, Elf64_Addr, ... */
- ELF_T_DYN, /* Dynamic section record. */
- ELF_T_EHDR, /* ELF header. */
- ELF_T_HALF, /* Elf32_Half, Elf64_Half, ... */
- ELF_T_OFF, /* Elf32_Off, Elf64_Off, ... */
- ELF_T_PHDR, /* Program header. */
- ELF_T_RELA, /* Relocation entry with addend. */
- ELF_T_REL, /* Relocation entry. */
- ELF_T_SHDR, /* Section header. */
- ELF_T_SWORD, /* Elf32_Sword, Elf64_Sword, ... */
- ELF_T_SYM, /* Symbol record. */
- ELF_T_WORD, /* Elf32_Word, Elf64_Word, ... */
- ELF_T_XWORD, /* Elf32_Xword, Elf64_Xword, ... */
- ELF_T_SXWORD, /* Elf32_Sxword, Elf64_Sxword, ... */
- ELF_T_VDEF, /* Elf32_Verdef, Elf64_Verdef, ... */
- ELF_T_VDAUX, /* Elf32_Verdaux, Elf64_Verdaux, ... */
- ELF_T_VNEED, /* Elf32_Verneed, Elf64_Verneed, ... */
- ELF_T_VNAUX, /* Elf32_Vernaux, Elf64_Vernaux, ... */
- ELF_T_NHDR, /* Elf32_Nhdr, Elf64_Nhdr, ... */
- ELF_T_SYMINFO, /* Elf32_Syminfo, Elf64_Syminfo, ... */
- ELF_T_MOVE, /* Elf32_Move, Elf64_Move, ... */
- ELF_T_LIB, /* Elf32_Lib, Elf64_Lib, ... */
- ELF_T_GNUHASH, /* GNU-style hash section. */
- ELF_T_AUXV, /* Elf32_auxv_t, Elf64_auxv_t, ... */
- /* Keep this the last entry. */
- ELF_T_NUM
-} Elf_Type;
-
-/* Descriptor for data to be converted to or from memory format. */
-typedef struct
-{
- void *d_buf; /* Pointer to the actual data. */
- Elf_Type d_type; /* Type of this piece of data. */
- unsigned int d_version; /* ELF version. */
- size_t d_size; /* Size in bytes. */
- loff_t d_off; /* Offset into section. */
- size_t d_align; /* Alignment in section. */
-} Elf_Data;
-
-
-/* Commands for `...'. */
-typedef enum
-{
- ELF_C_NULL, /* Nothing, terminate, or compute only. */
- ELF_C_READ, /* Read .. */
- ELF_C_RDWR, /* Read and write .. */
- ELF_C_WRITE, /* Write .. */
- ELF_C_CLR, /* Clear flag. */
- ELF_C_SET, /* Set flag. */
- ELF_C_FDDONE, /* Signal that file descriptor will not be
- used anymore. */
- ELF_C_FDREAD, /* Read rest of data so that file descriptor
- is not used anymore. */
- /* The following are extensions. */
- ELF_C_READ_MMAP, /* Read, but mmap the file if possible. */
- ELF_C_RDWR_MMAP, /* Read and write, with mmap. */
- ELF_C_WRITE_MMAP, /* Write, with mmap. */
- ELF_C_READ_MMAP_PRIVATE, /* Read, but memory is writable, results are
- not written to the file. */
- ELF_C_EMPTY, /* Copy basic file data but not the content. */
- /* Keep this the last entry. */
- ELF_C_NUM
-} Elf_Cmd;
-
-
-/* Flags for the ELF structures. */
-enum
-{
- ELF_F_DIRTY = 0x1,
-#define ELF_F_DIRTY ELF_F_DIRTY
- ELF_F_LAYOUT = 0x4,
-#define ELF_F_LAYOUT ELF_F_LAYOUT
- ELF_F_PERMISSIVE = 0x8
-#define ELF_F_PERMISSIVE ELF_F_PERMISSIVE
-};
-
-
-/* Identification values for recognized object files. */
-typedef enum
-{
- ELF_K_NONE, /* Unknown. */
- ELF_K_AR, /* Archive. */
- ELF_K_COFF, /* Stupid old COFF. */
- ELF_K_ELF, /* ELF file. */
- /* Keep this the last entry. */
- ELF_K_NUM
-} Elf_Kind;
-
-
-/* Archive member header. */
-typedef struct
-{
- char *ar_name; /* Name of archive member. */
- time_t ar_date; /* File date. */
- uid_t ar_uid; /* User ID. */
- gid_t ar_gid; /* Group ID. */
- mode_t ar_mode; /* File mode. */
- loff_t ar_size; /* File size. */
- char *ar_rawname; /* Original name of archive member. */
-} Elf_Arhdr;
-
-
-/* Archive symbol table entry. */
-typedef struct
-{
- char *as_name; /* Symbol name. */
- size_t as_off; /* Offset for this file in the archive. */
- unsigned long int as_hash; /* Hash value of the name. */
-} Elf_Arsym;
-
-
-/* Descriptor for the ELF file. */
-typedef struct Elf Elf;
-
-/* Descriptor for ELF file section. */
-typedef struct Elf_Scn Elf_Scn;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return descriptor for ELF file to work according to CMD. */
-extern Elf *elf_begin (int __fildes, Elf_Cmd __cmd, Elf *__ref);
-
-/* Create a clone of an existing ELF descriptor. */
- extern Elf *elf_clone (Elf *__elf, Elf_Cmd __cmd);
-
-/* Create descriptor for memory region. */
-extern Elf *elf_memory (char *__image, size_t __size);
-
-/* Advance archive descriptor to next element. */
-extern Elf_Cmd elf_next (Elf *__elf);
-
-/* Free resources allocated for ELF. */
-extern int elf_end (Elf *__elf);
-
-/* Update ELF descriptor and write file to disk. */
-extern loff_t elf_update (Elf *__elf, Elf_Cmd __cmd);
-
-/* Determine what kind of file is associated with ELF. */
-extern Elf_Kind elf_kind (Elf *__elf) __attribute__ ((__pure__));
-
-/* Get the base offset for an object file. */
-extern loff_t elf_getbase (Elf *__elf);
-
-
-/* Retrieve file identification data. */
-extern char *elf_getident (Elf *__elf, size_t *__nbytes);
-
-/* Retrieve class-dependent object file header. */
-extern Elf32_Ehdr *elf32_getehdr (Elf *__elf);
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern Elf64_Ehdr *elf64_getehdr (Elf *__elf);
-
-/* Create ELF header if none exists. */
-extern Elf32_Ehdr *elf32_newehdr (Elf *__elf);
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern Elf64_Ehdr *elf64_newehdr (Elf *__elf);
-
-/* Get the number of program headers in the ELF file. If the file uses
- more headers than can be represented in the e_phnum field of the ELF
- header the information from the sh_info field in the zeroth section
- header is used. */
-extern int elf_getphdrnum (Elf *__elf, size_t *__dst);
-
-/* Retrieve class-dependent program header table. */
-extern Elf32_Phdr *elf32_getphdr (Elf *__elf);
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern Elf64_Phdr *elf64_getphdr (Elf *__elf);
-
-/* Create ELF program header. */
-extern Elf32_Phdr *elf32_newphdr (Elf *__elf, size_t __cnt);
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern Elf64_Phdr *elf64_newphdr (Elf *__elf, size_t __cnt);
-
-
-/* Get section at INDEX. */
-extern Elf_Scn *elf_getscn (Elf *__elf, size_t __index);
-
-/* Get section at OFFSET. */
-extern Elf_Scn *elf32_offscn (Elf *__elf, Elf32_Off __offset);
-/* Similar bug this time the binary calls is ELFCLASS64. */
-extern Elf_Scn *elf64_offscn (Elf *__elf, Elf64_Off __offset);
-
-/* Get index of section. */
-extern size_t elf_ndxscn (Elf_Scn *__scn);
-
-/* Get section with next section index. */
-extern Elf_Scn *elf_nextscn (Elf *__elf, Elf_Scn *__scn);
-
-/* Create a new section and append it at the end of the table. */
-extern Elf_Scn *elf_newscn (Elf *__elf);
-
-/* Get the section index of the extended section index table for the
- given symbol table. */
-extern int elf_scnshndx (Elf_Scn *__scn);
-
-/* Get the number of sections in the ELF file. If the file uses more
- sections than can be represented in the e_shnum field of the ELF
- header the information from the sh_size field in the zeroth section
- header is used. */
-extern int elf_getshdrnum (Elf *__elf, size_t *__dst);
-/* Sun messed up the implementation of 'elf_getshnum' in their implementation.
- It was agreed to make the same functionality available under a different
- name and obsolete the old name. */
-extern int elf_getshnum (Elf *__elf, size_t *__dst)
- __attribute__ ((__deprecated__));
-
-
-/* Get the section index of the section header string table in the ELF
- file. If the index cannot be represented in the e_shnum field of
- the ELF header the information from the sh_link field in the zeroth
- section header is used. */
-extern int elf_getshdrstrndx (Elf *__elf, size_t *__dst);
-/* Sun messed up the implementation of 'elf_getshnum' in their implementation.
- It was agreed to make the same functionality available under a different
- name and obsolete the old name. */
-extern int elf_getshstrndx (Elf *__elf, size_t *__dst)
- __attribute__ ((__deprecated__));
-
-
-/* Retrieve section header of ELFCLASS32 binary. */
-extern Elf32_Shdr *elf32_getshdr (Elf_Scn *__scn);
-/* Similar for ELFCLASS64. */
-extern Elf64_Shdr *elf64_getshdr (Elf_Scn *__scn);
-
-
-/* Set or clear flags for ELF file. */
-extern unsigned int elf_flagelf (Elf *__elf, Elf_Cmd __cmd,
- unsigned int __flags);
-/* Similarly for the ELF header. */
-extern unsigned int elf_flagehdr (Elf *__elf, Elf_Cmd __cmd,
- unsigned int __flags);
-/* Similarly for the ELF program header. */
-extern unsigned int elf_flagphdr (Elf *__elf, Elf_Cmd __cmd,
- unsigned int __flags);
-/* Similarly for the given ELF section. */
-extern unsigned int elf_flagscn (Elf_Scn *__scn, Elf_Cmd __cmd,
- unsigned int __flags);
-/* Similarly for the given ELF data. */
-extern unsigned int elf_flagdata (Elf_Data *__data, Elf_Cmd __cmd,
- unsigned int __flags);
-/* Similarly for the given ELF section header. */
-extern unsigned int elf_flagshdr (Elf_Scn *__scn, Elf_Cmd __cmd,
- unsigned int __flags);
-
-
-/* Get data from section while translating from file representation
- to memory representation. */
-extern Elf_Data *elf_getdata (Elf_Scn *__scn, Elf_Data *__data);
-
-/* Get uninterpreted section content. */
-extern Elf_Data *elf_rawdata (Elf_Scn *__scn, Elf_Data *__data);
-
-/* Create new data descriptor for section SCN. */
-extern Elf_Data *elf_newdata (Elf_Scn *__scn);
-
-/* Get data translated from a chunk of the file contents as section data
- would be for TYPE. The resulting Elf_Data pointer is valid until
- elf_end (ELF) is called. */
-extern Elf_Data *elf_getdata_rawchunk (Elf *__elf,
- loff_t __offset, size_t __size,
- Elf_Type __type);
-
-
-/* Return pointer to string at OFFSET in section INDEX. */
-extern char *elf_strptr (Elf *__elf, size_t __index, size_t __offset);
-
-
-/* Return header of archive. */
-extern Elf_Arhdr *elf_getarhdr (Elf *__elf);
-
-/* Return offset in archive for current file ELF. */
-extern loff_t elf_getaroff (Elf *__elf);
-
-/* Select archive element at OFFSET. */
-extern size_t elf_rand (Elf *__elf, size_t __offset);
-
-/* Get symbol table of archive. */
-extern Elf_Arsym *elf_getarsym (Elf *__elf, size_t *__narsyms);
-
-
-/* Control ELF descriptor. */
-extern int elf_cntl (Elf *__elf, Elf_Cmd __cmd);
-
-/* Retrieve uninterpreted file contents. */
-extern char *elf_rawfile (Elf *__elf, size_t *__nbytes);
-
-
-/* Return size of array of COUNT elements of the type denoted by TYPE
- in the external representation. The binary class is taken from ELF.
- The result is based on version VERSION of the ELF standard. */
-extern size_t elf32_fsize (Elf_Type __type, size_t __count,
- unsigned int __version)
- __attribute__ ((__const__));
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern size_t elf64_fsize (Elf_Type __type, size_t __count,
- unsigned int __version)
- __attribute__ ((__const__));
-
-
-/* Convert data structure from the representation in the file represented
- by ELF to their memory representation. */
-extern Elf_Data *elf32_xlatetom (Elf_Data *__dest, const Elf_Data *__src,
- unsigned int __encode);
-/* Same for 64 bit class. */
-extern Elf_Data *elf64_xlatetom (Elf_Data *__dest, const Elf_Data *__src,
- unsigned int __encode);
-
-/* Convert data structure from to the representation in memory
- represented by ELF file representation. */
-extern Elf_Data *elf32_xlatetof (Elf_Data *__dest, const Elf_Data *__src,
- unsigned int __encode);
-/* Same for 64 bit class. */
-extern Elf_Data *elf64_xlatetof (Elf_Data *__dest, const Elf_Data *__src,
- unsigned int __encode);
-
-
-/* Return error code of last failing function call. This value is kept
- separately for each thread. */
-extern int elf_errno (void);
-
-/* Return error string for ERROR. If ERROR is zero, return error string
- for most recent error or NULL is none occurred. If ERROR is -1 the
- behaviour is similar to the last case except that not NULL but a legal
- string is returned. */
-extern const char *elf_errmsg (int __error);
-
-
-/* Coordinate ELF library and application versions. */
-extern unsigned int elf_version (unsigned int __version);
-
-/* Set fill bytes used to fill holes in data structures. */
-extern void elf_fill (int __fill);
-
-/* Compute hash value. */
-extern unsigned long int elf_hash (const char *__string)
- __attribute__ ((__pure__));
-
-/* Compute hash value using the GNU-specific hash function. */
-extern unsigned long int elf_gnu_hash (const char *__string)
- __attribute__ ((__pure__));
-
-
-/* Compute simple checksum from permanent parts of the ELF file. */
-extern long int elf32_checksum (Elf *__elf);
-/* Similar but this time the binary calls is ELFCLASS64. */
-extern long int elf64_checksum (Elf *__elf);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libelf.h */
diff --git a/libelf/libelf.h.in b/libelf/libelf.h.in
new file mode 100644
index 000000000000..b42712137f18
--- /dev/null
+++ b/libelf/libelf.h.in
@@ -0,0 +1,396 @@
+/* Interface for libelf.
+ Copyright (C) 1998-2010 Red Hat, Inc.
+ This file is part of elfutils.
+
+ This file is free software; you can redistribute it and/or modify
+ it under the terms of either
+
+ * the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at
+ your option) any later version
+
+ or
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at
+ your option) any later version
+
+ or both in parallel, as here.
+
+ elfutils is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received copies of the GNU General Public License and
+ the GNU Lesser General Public License along with this program. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef _LIBELF_H
+#define _LIBELF_H 1
+
+#include <sys/types.h>
+
+/* Get the ELF types. */
+#include <elf.h>
+
+
+/* Known translation types. */
+typedef enum
+{
+ ELF_T_BYTE, /* unsigned char */
+ ELF_T_ADDR, /* Elf32_Addr, Elf64_Addr, ... */
+ ELF_T_DYN, /* Dynamic section record. */
+ ELF_T_EHDR, /* ELF header. */
+ ELF_T_HALF, /* Elf32_Half, Elf64_Half, ... */
+ ELF_T_OFF, /* Elf32_Off, Elf64_Off, ... */
+ ELF_T_PHDR, /* Program header. */
+ ELF_T_RELA, /* Relocation entry with addend. */
+ ELF_T_REL, /* Relocation entry. */
+ ELF_T_SHDR, /* Section header. */
+ ELF_T_SWORD, /* Elf32_Sword, Elf64_Sword, ... */
+ ELF_T_SYM, /* Symbol record. */
+ ELF_T_WORD, /* Elf32_Word, Elf64_Word, ... */
+ ELF_T_XWORD, /* Elf32_Xword, Elf64_Xword, ... */
+ ELF_T_SXWORD, /* Elf32_Sxword, Elf64_Sxword, ... */
+ ELF_T_VDEF, /* Elf32_Verdef, Elf64_Verdef, ... */
+ ELF_T_VDAUX, /* Elf32_Verdaux, Elf64_Verdaux, ... */
+ ELF_T_VNEED, /* Elf32_Verneed, Elf64_Verneed, ... */
+ ELF_T_VNAUX, /* Elf32_Vernaux, Elf64_Vernaux, ... */
+ ELF_T_NHDR, /* Elf32_Nhdr, Elf64_Nhdr, ... */
+ ELF_T_SYMINFO, /* Elf32_Syminfo, Elf64_Syminfo, ... */
+ ELF_T_MOVE, /* Elf32_Move, Elf64_Move, ... */
+ ELF_T_LIB, /* Elf32_Lib, Elf64_Lib, ... */
+ ELF_T_GNUHASH, /* GNU-style hash section. */
+ ELF_T_AUXV, /* Elf32_auxv_t, Elf64_auxv_t, ... */
+ /* Keep this the last entry. */
+ ELF_T_NUM
+} Elf_Type;
+
+/* Descriptor for data to be converted to or from memory format. */
+typedef struct
+{
+ void *d_buf; /* Pointer to the actual data. */
+ Elf_Type d_type; /* Type of this piece of data. */
+ unsigned int d_version; /* ELF version. */
+ size_t d_size; /* Size in bytes. */
+ @loff_t@ d_off; /* Offset into section. */
+ size_t d_align; /* Alignment in section. */
+} Elf_Data;
+
+
+/* Commands for `...'. */
+typedef enum
+{
+ ELF_C_NULL, /* Nothing, terminate, or compute only. */
+ ELF_C_READ, /* Read .. */
+ ELF_C_RDWR, /* Read and write .. */
+ ELF_C_WRITE, /* Write .. */
+ ELF_C_CLR, /* Clear flag. */
+ ELF_C_SET, /* Set flag. */
+ ELF_C_FDDONE, /* Signal that file descriptor will not be
+ used anymore. */
+ ELF_C_FDREAD, /* Read rest of data so that file descriptor
+ is not used anymore. */
+ /* The following are extensions. */
+ ELF_C_READ_MMAP, /* Read, but mmap the file if possible. */
+ ELF_C_RDWR_MMAP, /* Read and write, with mmap. */
+ ELF_C_WRITE_MMAP, /* Write, with mmap. */
+ ELF_C_READ_MMAP_PRIVATE, /* Read, but memory is writable, results are
+ not written to the file. */
+ ELF_C_EMPTY, /* Copy basic file data but not the content. */
+ /* Keep this the last entry. */
+ ELF_C_NUM
+} Elf_Cmd;
+
+
+/* Flags for the ELF structures. */
+enum
+{
+ ELF_F_DIRTY = 0x1,
+#define ELF_F_DIRTY ELF_F_DIRTY
+ ELF_F_LAYOUT = 0x4,
+#define ELF_F_LAYOUT ELF_F_LAYOUT
+ ELF_F_PERMISSIVE = 0x8
+#define ELF_F_PERMISSIVE ELF_F_PERMISSIVE
+};
+
+
+/* Identification values for recognized object files. */
+typedef enum
+{
+ ELF_K_NONE, /* Unknown. */
+ ELF_K_AR, /* Archive. */
+ ELF_K_COFF, /* Stupid old COFF. */
+ ELF_K_ELF, /* ELF file. */
+ /* Keep this the last entry. */
+ ELF_K_NUM
+} Elf_Kind;
+
+
+/* Archive member header. */
+typedef struct
+{
+ char *ar_name; /* Name of archive member. */
+ time_t ar_date; /* File date. */
+ uid_t ar_uid; /* User ID. */
+ gid_t ar_gid; /* Group ID. */
+ mode_t ar_mode; /* File mode. */
+ @loff_t@ ar_size; /* File size. */
+ char *ar_rawname; /* Original name of archive member. */
+} Elf_Arhdr;
+
+
+/* Archive symbol table entry. */
+typedef struct
+{
+ char *as_name; /* Symbol name. */
+ size_t as_off; /* Offset for this file in the archive. */
+ unsigned long int as_hash; /* Hash value of the name. */
+} Elf_Arsym;
+
+
+/* Descriptor for the ELF file. */
+typedef struct Elf Elf;
+
+/* Descriptor for ELF file section. */
+typedef struct Elf_Scn Elf_Scn;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Return descriptor for ELF file to work according to CMD. */
+extern Elf *elf_begin (int __fildes, Elf_Cmd __cmd, Elf *__ref);
+
+/* Create a clone of an existing ELF descriptor. */
+ extern Elf *elf_clone (Elf *__elf, Elf_Cmd __cmd);
+
+/* Create descriptor for memory region. */
+extern Elf *elf_memory (char *__image, size_t __size);
+
+/* Advance archive descriptor to next element. */
+extern Elf_Cmd elf_next (Elf *__elf);
+
+/* Free resources allocated for ELF. */
+extern int elf_end (Elf *__elf);
+
+/* Update ELF descriptor and write file to disk. */
+extern @loff_t@ elf_update (Elf *__elf, Elf_Cmd __cmd);
+
+/* Determine what kind of file is associated with ELF. */
+extern Elf_Kind elf_kind (Elf *__elf) __attribute__ ((__pure__));
+
+/* Get the base offset for an object file. */
+extern @loff_t@ elf_getbase (Elf *__elf);
+
+
+/* Retrieve file identification data. */
+extern char *elf_getident (Elf *__elf, size_t *__nbytes);
+
+/* Retrieve class-dependent object file header. */
+extern Elf32_Ehdr *elf32_getehdr (Elf *__elf);
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern Elf64_Ehdr *elf64_getehdr (Elf *__elf);
+
+/* Create ELF header if none exists. */
+extern Elf32_Ehdr *elf32_newehdr (Elf *__elf);
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern Elf64_Ehdr *elf64_newehdr (Elf *__elf);
+
+/* Get the number of program headers in the ELF file. If the file uses
+ more headers than can be represented in the e_phnum field of the ELF
+ header the information from the sh_info field in the zeroth section
+ header is used. */
+extern int elf_getphdrnum (Elf *__elf, size_t *__dst);
+
+/* Retrieve class-dependent program header table. */
+extern Elf32_Phdr *elf32_getphdr (Elf *__elf);
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern Elf64_Phdr *elf64_getphdr (Elf *__elf);
+
+/* Create ELF program header. */
+extern Elf32_Phdr *elf32_newphdr (Elf *__elf, size_t __cnt);
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern Elf64_Phdr *elf64_newphdr (Elf *__elf, size_t __cnt);
+
+
+/* Get section at INDEX. */
+extern Elf_Scn *elf_getscn (Elf *__elf, size_t __index);
+
+/* Get section at OFFSET. */
+extern Elf_Scn *elf32_offscn (Elf *__elf, Elf32_Off __offset);
+/* Similar bug this time the binary calls is ELFCLASS64. */
+extern Elf_Scn *elf64_offscn (Elf *__elf, Elf64_Off __offset);
+
+/* Get index of section. */
+extern size_t elf_ndxscn (Elf_Scn *__scn);
+
+/* Get section with next section index. */
+extern Elf_Scn *elf_nextscn (Elf *__elf, Elf_Scn *__scn);
+
+/* Create a new section and append it at the end of the table. */
+extern Elf_Scn *elf_newscn (Elf *__elf);
+
+/* Get the section index of the extended section index table for the
+ given symbol table. */
+extern int elf_scnshndx (Elf_Scn *__scn);
+
+/* Get the number of sections in the ELF file. If the file uses more
+ sections than can be represented in the e_shnum field of the ELF
+ header the information from the sh_size field in the zeroth section
+ header is used. */
+extern int elf_getshdrnum (Elf *__elf, size_t *__dst);
+/* Sun messed up the implementation of 'elf_getshnum' in their implementation.
+ It was agreed to make the same functionality available under a different
+ name and obsolete the old name. */
+extern int elf_getshnum (Elf *__elf, size_t *__dst)
+ __attribute__ ((__deprecated__));
+
+
+/* Get the section index of the section header string table in the ELF
+ file. If the index cannot be represented in the e_shnum field of
+ the ELF header the information from the sh_link field in the zeroth
+ section header is used. */
+extern int elf_getshdrstrndx (Elf *__elf, size_t *__dst);
+/* Sun messed up the implementation of 'elf_getshnum' in their implementation.
+ It was agreed to make the same functionality available under a different
+ name and obsolete the old name. */
+extern int elf_getshstrndx (Elf *__elf, size_t *__dst)
+ __attribute__ ((__deprecated__));
+
+
+/* Retrieve section header of ELFCLASS32 binary. */
+extern Elf32_Shdr *elf32_getshdr (Elf_Scn *__scn);
+/* Similar for ELFCLASS64. */
+extern Elf64_Shdr *elf64_getshdr (Elf_Scn *__scn);
+
+
+/* Set or clear flags for ELF file. */
+extern unsigned int elf_flagelf (Elf *__elf, Elf_Cmd __cmd,
+ unsigned int __flags);
+/* Similarly for the ELF header. */
+extern unsigned int elf_flagehdr (Elf *__elf, Elf_Cmd __cmd,
+ unsigned int __flags);
+/* Similarly for the ELF program header. */
+extern unsigned int elf_flagphdr (Elf *__elf, Elf_Cmd __cmd,
+ unsigned int __flags);
+/* Similarly for the given ELF section. */
+extern unsigned int elf_flagscn (Elf_Scn *__scn, Elf_Cmd __cmd,
+ unsigned int __flags);
+/* Similarly for the given ELF data. */
+extern unsigned int elf_flagdata (Elf_Data *__data, Elf_Cmd __cmd,
+ unsigned int __flags);
+/* Similarly for the given ELF section header. */
+extern unsigned int elf_flagshdr (Elf_Scn *__scn, Elf_Cmd __cmd,
+ unsigned int __flags);
+
+
+/* Get data from section while translating from file representation
+ to memory representation. */
+extern Elf_Data *elf_getdata (Elf_Scn *__scn, Elf_Data *__data);
+
+/* Get uninterpreted section content. */
+extern Elf_Data *elf_rawdata (Elf_Scn *__scn, Elf_Data *__data);
+
+/* Create new data descriptor for section SCN. */
+extern Elf_Data *elf_newdata (Elf_Scn *__scn);
+
+/* Get data translated from a chunk of the file contents as section data
+ would be for TYPE. The resulting Elf_Data pointer is valid until
+ elf_end (ELF) is called. */
+extern Elf_Data *elf_getdata_rawchunk (Elf *__elf,
+ @loff_t@ __offset, size_t __size,
+ Elf_Type __type);
+
+
+/* Return pointer to string at OFFSET in section INDEX. */
+extern char *elf_strptr (Elf *__elf, size_t __index, size_t __offset);
+
+
+/* Return header of archive. */
+extern Elf_Arhdr *elf_getarhdr (Elf *__elf);
+
+/* Return offset in archive for current file ELF. */
+extern @loff_t@ elf_getaroff (Elf *__elf);
+
+/* Select archive element at OFFSET. */
+extern size_t elf_rand (Elf *__elf, size_t __offset);
+
+/* Get symbol table of archive. */
+extern Elf_Arsym *elf_getarsym (Elf *__elf, size_t *__narsyms);
+
+
+/* Control ELF descriptor. */
+extern int elf_cntl (Elf *__elf, Elf_Cmd __cmd);
+
+/* Retrieve uninterpreted file contents. */
+extern char *elf_rawfile (Elf *__elf, size_t *__nbytes);
+
+
+/* Return size of array of COUNT elements of the type denoted by TYPE
+ in the external representation. The binary class is taken from ELF.
+ The result is based on version VERSION of the ELF standard. */
+extern size_t elf32_fsize (Elf_Type __type, size_t __count,
+ unsigned int __version)
+ __attribute__ ((__const__));
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern size_t elf64_fsize (Elf_Type __type, size_t __count,
+ unsigned int __version)
+ __attribute__ ((__const__));
+
+
+/* Convert data structure from the representation in the file represented
+ by ELF to their memory representation. */
+extern Elf_Data *elf32_xlatetom (Elf_Data *__dest, const Elf_Data *__src,
+ unsigned int __encode);
+/* Same for 64 bit class. */
+extern Elf_Data *elf64_xlatetom (Elf_Data *__dest, const Elf_Data *__src,
+ unsigned int __encode);
+
+/* Convert data structure from to the representation in memory
+ represented by ELF file representation. */
+extern Elf_Data *elf32_xlatetof (Elf_Data *__dest, const Elf_Data *__src,
+ unsigned int __encode);
+/* Same for 64 bit class. */
+extern Elf_Data *elf64_xlatetof (Elf_Data *__dest, const Elf_Data *__src,
+ unsigned int __encode);
+
+
+/* Return error code of last failing function call. This value is kept
+ separately for each thread. */
+extern int elf_errno (void);
+
+/* Return error string for ERROR. If ERROR is zero, return error string
+ for most recent error or NULL is none occurred. If ERROR is -1 the
+ behaviour is similar to the last case except that not NULL but a legal
+ string is returned. */
+extern const char *elf_errmsg (int __error);
+
+
+/* Coordinate ELF library and application versions. */
+extern unsigned int elf_version (unsigned int __version);
+
+/* Set fill bytes used to fill holes in data structures. */
+extern void elf_fill (int __fill);
+
+/* Compute hash value. */
+extern unsigned long int elf_hash (const char *__string)
+ __attribute__ ((__pure__));
+
+/* Compute hash value using the GNU-specific hash function. */
+extern unsigned long int elf_gnu_hash (const char *__string)
+ __attribute__ ((__pure__));
+
+
+/* Compute simple checksum from permanent parts of the ELF file. */
+extern long int elf32_checksum (Elf *__elf);
+/* Similar but this time the binary calls is ELFCLASS64. */
+extern long int elf64_checksum (Elf *__elf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libelf.h */
diff --git a/src/ChangeLog b/src/ChangeLog
index ef09a091e2ed..df9abad14b92 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2015-10-09 Josh Stone <jistone@redhat.com>
+ * Makefile.am (AM_CPPFLAGS): Add -I$(builddir)/../libelf.
+
+2015-10-09 Josh Stone <jistone@redhat.com>
+
* elflint.c (main): Replace stat64 and fstat64 with stat and fstat.
* readelf.c (process_file): Likewise.
(process_elf_file): Replace off64_t with off_t.
diff --git a/src/Makefile.am b/src/Makefile.am
index afb38fc0f313..866568edf1ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,8 @@ DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \
-DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
-I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
- -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm
+ -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm \
+ -I$(builddir)/../libelf
AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 11515501ce2d..dc99f4545445 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
2015-10-09 Josh Stone <jistone@redhat.com>
+ * Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/libelf.
+
+2015-10-09 Josh Stone <jistone@redhat.com>
+
* lfs-symbols: New list of LFS-related symbols from lintian.
* testfile-nolfs.bz2: New test binary for sanity checking.
* run-lfs-symbols.sh: New test.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5612fc7b5f48..2f902c27e8be 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,7 @@ if !STANDALONE
AM_CPPFLAGS += -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
-I$(top_srcdir)/libdwfl -I$(top_srcdir)/libdwelf \
-I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
- -I$(top_srcdir)/lib -I..
+ -I$(top_srcdir)/lib -I$(top_builddir)/libelf -I..
AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf
endif
--
2.4.3