]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
Merge 0.161 into mjw/RH-DTS
authorMark Wielaard <mjw@redhat.com>
Fri, 19 Dec 2014 22:20:25 +0000 (23:20 +0100)
committerMark Wielaard <mjw@redhat.com>
Fri, 19 Dec 2014 22:20:25 +0000 (23:20 +0100)
1  2 
backends/Makefile.am
libasm/Makefile.am
libdw/Makefile.am
libebl/eblopenbackend.c
libelf/Makefile.am
src/Makefile.am
tests/Makefile.am

Simple merge
Simple merge
index 2b60b8a7d3a9f3d67ae1efadf38842874008ad77,887da6b0ecd6525eaf359213f29745cc0ead1a55..65f083a4badfc33c7de110ba58a92160c9c8fe72
@@@ -87,22 -88,9 +89,23 @@@ libdw_a_SOURCES = dwarf_begin.c dwarf_b
                  dwarf_getcfi.c dwarf_getcfi_elf.c dwarf_cfi_end.c \
                  dwarf_aggregate_size.c dwarf_getlocation_implicit_pointer.c \
                  dwarf_getlocation_die.c dwarf_getlocation_attr.c \
-                 dwarf_getalt.c dwarf_setalt.c
+                 dwarf_getalt.c dwarf_setalt.c dwarf_cu_getdwarf.c \
+                 dwarf_cu_die.c dwarf_peel_type.c
  
 +# Minimal library with symbols needed by those libebl backends that we
 +# ship statically.  This is so that e.g. strip doesn't end up bringing
 +# in the whole of libdw, and depending on libbz2, liblzma, etc.
 +libdw_static_pic_a_SOURCES = libdw_form.c dwarf_child.c dwarf_attr.c \
 +              dwarf_attr_integrate.c dwarf_formref_die.c dwarf_error.c \
 +              dwarf_tag.c dwarf_formref.c \
 +              dwarf_abbrev_hash.c dwarf_sig8_hash.c \
 +              dwarf_formudata.c libdw_findcu.c dwarf_offdie.c \
 +              dwarf_getabbrev.c dwarf_nextcu.c libdw_alloc.c \
 +              dwarf_hasattr_integrate.c dwarf_hasattr.c \
 +              dwarf_aggregate_size.c dwarf_siblingof.c dwarf_formsdata.c \
 +              dwarf_srclang.c dwarf_formflag.c dwarf_diecu.c \
 +              dwarf_bytesize.c dwarf_bitsize.c
 +
  if MAINTAINER_MODE
  BUILT_SOURCES = $(srcdir)/known-dwarf.h
  MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h
Simple merge
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge