Merge tag 'elfutils-0.173' into mjw/RH-DTS

elfutils 0.173 release

Removed riscv backend for now.
Removed new arm32 tests.
Added various new files to libdw_static_pic.a to support split dwarf.

diff --cc backends/Makefile.am
index 03b9d2019b15290ed4e758d71c064cb4056b5c2a,e42d67413ca9a939bcfd485f22c45c94b746ad5d..dcf6539411139223b514f288f2d991287d112072
--- 1/backends/Makefile.am
--- 2/backends/Makefile.am
+++ b/backends/Makefile.am
@@@ -38,41 -38,15 +38,41 @@@ libebl_pic = libebl_i386_pic.a libebl_s
             libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a    \
             libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
             libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
-            libebl_m68k_pic.a libebl_bpf_pic.a
+            libebl_m68k_pic.a libebl_bpf_pic.a libebl_riscv_pic.a
  noinst_LIBRARIES = $(libebl_pic)
  noinst_DATA = $(libebl_pic:_pic.a=.so)
 +lib_LIBRARIES = libebl_static_pic.a
  
  
  libelf = ../libelf/libelf.so
  libdw = ../libdw/libdw.so
  libeu = ../lib/libeu.a
  
-            s390_unwind.c bpf_init.c bpf_regs.c
 +# The following is minimal set of backends that we link with libdw to
 +# avoid dlopen. Note repeats files below because some backends reuse
 +# each others files.
 +static_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \
 +           i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \
 +           i386_initreg.c i386_unwind.c \
 +           x86_64_init.c x86_64_symbol.c x86_64_corenote.c x86_64_cfi.c \
 +           x86_64_retval.c x86_64_regs.c x86_64_syscall.c \
 +           x86_64_initreg.c x86_64_unwind.c x32_corenote.c \
 +           ia64_init.c ia64_symbol.c ia64_regs.c ia64_retval.c \
 +           aarch64_init.c aarch64_regs.c aarch64_symbol.c   \
 +           aarch64_corenote.c aarch64_retval.c aarch64_cfi.c \
 +           aarch64_initreg.c aarch64_unwind.c \
 +           ppc_init.c ppc_symbol.c ppc_retval.c ppc_regs.c \
 +           ppc_corenote.c ppc_auxv.c ppc_attrs.c ppc_syscall.c \
 +           ppc_cfi.c ppc_initreg.c \
 +           ppc64_init.c ppc64_symbol.c ppc64_retval.c ppc64_corenote.c \
 +           ppc64_resolve_sym.c ppc64_unwind.c \
 +           s390_init.c s390_symbol.c s390_regs.c s390_retval.c \
 +           s390_corenote.c s390x_corenote.c s390_cfi.c s390_initreg.c \
++           s390_unwind.c bpf_init.c bpf_regs.c bpf_symbol.c
 +
 +libebl_static_pic_a_SOURCES = $(static_SRCS)
 +am_libebl_static_pic_a_OBJECTS = $(static_SRCS:.c=.os)
 +
  i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \
            i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \
            i386_initreg.c i386_unwind.c

diff --cc configure.ac
index 0ca9ae24cb79f6e4bb3522da233e32d0d9d8d939,1cf6245bd21d878e50244ba9e68f14b64a2796c2..d6108cde3568d3c344badcc176ed36655b522d3b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -17,14 -17,8 +17,14 @@@ dnl  GNU General Public License for mor
  dnl
  dnl  You should have received a copy of the GNU General Public License
  dnl  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- AC_INIT([elfutils],[0.170],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
+ AC_INIT([elfutils],[0.173],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
  
 +dnl Workaround for older autoconf < 2.64
 +m4_ifndef([AC_PACKAGE_URL],
 +         [AC_DEFINE([PACKAGE_URL], ["http://elfutils.org/"],
 +                    [Define to home page for this package])
 +          AC_SUBST([PACKAGE_URL], ["http://elfutils.org/"])])
 +
  dnl Workaround for older autoconf < 2.64
  m4_ifndef([AC_PACKAGE_URL],
           [AC_DEFINE([PACKAGE_URL], ["http://elfutils.org/"],

diff --cc libasm/Makefile.am
Simple merge

diff --cc libcpu/Makefile.am
Simple merge

diff --cc libdw/Makefile.am
index b3e781d80dce6205767988ccd2fc2c0abb2f919a,7a3d53227a483786eac04d1061c25349532fcd55..166e37cfe60a6da39c7fa2b649af48a6cb233fba
--- 1/libdw/Makefile.am
--- 2/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@@ -90,23 -89,11 +90,30 @@@ libdw_a_SOURCES = dwarf_begin.c dwarf_b
                  dwarf_aggregate_size.c dwarf_getlocation_implicit_pointer.c \
                  dwarf_getlocation_die.c dwarf_getlocation_attr.c \
                  dwarf_getalt.c dwarf_setalt.c dwarf_cu_getdwarf.c \
-                 dwarf_cu_die.c dwarf_peel_type.c dwarf_default_lower_bound.c
+                 dwarf_cu_die.c dwarf_peel_type.c dwarf_default_lower_bound.c \
+                 dwarf_die_addr_die.c dwarf_get_units.c \
+                 libdw_find_split_unit.c dwarf_cu_info.c \
+                 dwarf_next_lines.c
  
-               dwarf_default_lower_bound.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 dwarf_peel_type.c \
++              dwarf_default_lower_bound.c libdw_find_split_unit.c \
++              dwarf_getalt.c dwarf_haschildren.c \
++              dwarf_begin.c dwarf_begin_elf.c dwarf_end.c frame-cache.c \
++              dwarf_get_units.c dwarf_formstring.c \
++              ../libdwelf/dwelf_dwarf_gnu_debugaltlink.c
 +
  if MAINTAINER_MODE
  BUILT_SOURCES = $(srcdir)/known-dwarf.h
  MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h

diff --cc libebl/Makefile.am
Simple merge

diff --cc libebl/eblopenbackend.c
index 1728115c8d5f6991ed7fa6570021eb1f8e8fd5d7,8b063f4127fa252fefce6b90f851ec12ce65cbfa..e13456e3de8ee04f674a760ecc36930270e86fae
--- 1/libebl/eblopenbackend.c
--- 2/libebl/eblopenbackend.c
+++ b/libebl/eblopenbackend.c
@@@ -66,82 -58,84 +66,84 @@@ static const struc
    int data;
  } machines[] =
  {
 -  { "i386", "elf_i386", "i386", 4, EM_386, ELFCLASS32, ELFDATA2LSB },
 -  { "ia64", "elf_ia64", "ia64", 4, EM_IA_64, ELFCLASS64, ELFDATA2LSB },
 -  { "alpha", "elf_alpha", "alpha", 5, EM_ALPHA, ELFCLASS64, ELFDATA2LSB },
 -  { "x86_64", "elf_x86_64", "x86_64", 6, EM_X86_64, ELFCLASS64, ELFDATA2LSB },
 -  { "ppc", "elf_ppc", "ppc", 3, EM_PPC, ELFCLASS32, ELFDATA2MSB },
 -  { "ppc64", "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },
 -  { "tilegx", "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },
 +  { i386_init, "elf_i386", "i386", 4, EM_386, ELFCLASS32, ELFDATA2LSB },
 +  { ia64_init, "elf_ia64", "ia64", 4, EM_IA_64, ELFCLASS64, ELFDATA2LSB },
 +  { NULL, "elf_alpha", "alpha", 5, EM_ALPHA, ELFCLASS64, ELFDATA2LSB },
 +  { x86_64_init, "elf_x86_64", "x86_64", 6, EM_X86_64, ELFCLASS64, ELFDATA2LSB },
 +  { ppc_init, "elf_ppc", "ppc", 3, EM_PPC, ELFCLASS32, ELFDATA2MSB },
 +  { ppc64_init, "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },
 +  { NULL, "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },
    // XXX class and machine fields need to be filled in for all archs.
 -  { "sh", "elf_sh", "sh", 2, EM_SH, 0, 0 },
 -  { "arm", "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
 -  { "sparc", "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
 -  { "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
 -  { "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
 -  { "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 },
 -
 -  { "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 },
 -  { "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
 -  { "m88k", "elf_m88k", "m88k", 4, EM_88K, 0, 0 },
 -  { "i860", "elf_i860", "i860", 4, EM_860, 0, 0 },
 -  { "s370", "ebl_s370", "s370", 4, EM_S370, 0, 0 },
 -  { "parisc", "elf_parisc", "parisc", 6, EM_PARISC, 0, 0 },
 -  { "vpp500", "elf_vpp500", "vpp500", 5, EM_VPP500, 0, 0 },
 -  { "sparc", "elf_v8plus", "v8plus", 6, EM_SPARC32PLUS, 0, 0 },
 -  { "i960", "elf_i960", "i960", 4, EM_960, 0, 0 },
 -  { "v800", "ebl_v800", "v800", 4, EM_V800, 0, 0 },
 -  { "fr20", "ebl_fr20", "fr20", 4, EM_FR20, 0, 0 },
 -  { "rh32", "ebl_rh32", "rh32", 4, EM_RH32, 0, 0 },
 -  { "rce", "ebl_rce", "rce", 3, EM_RCE, 0, 0 },
 -  { "tricore", "elf_tricore", "tricore", 7, EM_TRICORE, 0, 0 },
 -  { "arc", "elf_arc", "arc", 3, EM_ARC, 0, 0 },
 -  { "h8", "elf_h8_300", "h8_300", 6, EM_H8_300, 0, 0 },
 -  { "h8", "elf_h8_300h", "h8_300h", 6, EM_H8_300H, 0, 0 },
 -  { "h8", "elf_h8s", "h8s", 6, EM_H8S, 0, 0 },
 -  { "h8", "elf_h8_500", "h8_500", 6, EM_H8_500, 0, 0 },
 -  { "coldfire", "elf_coldfire", "coldfire", 8, EM_COLDFIRE, 0, 0 },
 -  { "m68k", "elf_68hc12", "68hc12", 6, EM_68HC12, 0, 0 },
 -  { "mma", "elf_mma", "mma", 3, EM_MMA, 0, 0 },
 -  { "pcp", "elf_pcp", "pcp", 3, EM_PCP, 0, 0 },
 -  { "ncpu", "elf_ncpu", "ncpu", 4, EM_NCPU, 0, 0 },
 -  { "ndr1", "elf_ndr1", "ndr1", 4, EM_NDR1, 0, 0 },
 -  { "starcore", "elf_starcore", "starcore", 8, EM_STARCORE, 0, 0 },
 -  { "me16", "elf_me16", "em16", 4, EM_ME16, 0, 0 },
 -  { "st100", "elf_st100", "st100", 5, EM_ST100, 0, 0 },
 -  { "tinyj", "elf_tinyj", "tinyj", 5, EM_TINYJ, 0, 0 },
 -  { "pdsp", "elf_pdsp", "pdsp", 4, EM_PDSP, 0, 0 },
 -  { "fx66", "elf_fx66", "fx66", 4, EM_FX66, 0, 0 },
 -  { "st9plus", "elf_st9plus", "st9plus", 7, EM_ST9PLUS, 0, 0 },
 -  { "st7", "elf_st7", "st7", 3, EM_ST7, 0, 0 },
 -  { "m68k", "elf_68hc16", "68hc16", 6, EM_68HC16, 0, 0 },
 -  { "m68k", "elf_68hc11", "68hc11", 6, EM_68HC11, 0, 0 },
 -  { "m68k", "elf_68hc08", "68hc08", 6, EM_68HC08, 0, 0 },
 -  { "m68k", "elf_68hc05", "68hc05", 6, EM_68HC05, 0, 0 },
 -  { "svx", "elf_svx", "svx", 3, EM_SVX, 0, 0 },
 -  { "st19", "elf_st19", "st19", 4, EM_ST19, 0, 0 },
 -  { "vax", "elf_vax", "vax", 3, EM_VAX, 0, 0 },
 -  { "cris", "elf_cris", "cris", 4, EM_CRIS, 0, 0 },
 -  { "javelin", "elf_javelin", "javelin", 7, EM_JAVELIN, 0, 0 },
 -  { "firepath", "elf_firepath", "firepath", 8, EM_FIREPATH, 0, 0 },
 -  { "zsp", "elf_zsp", "zsp", 3, EM_ZSP, 0, 0 },
 -  { "mmix", "elf_mmix", "mmix", 4, EM_MMIX, 0, 0 },
 -  { "hunay", "elf_huany", "huany", 5, EM_HUANY, 0, 0 },
 -  { "prism", "elf_prism", "prism", 5, EM_PRISM, 0, 0 },
 -  { "avr", "elf_avr", "avr", 3, EM_AVR, 0, 0 },
 -  { "fr30", "elf_fr30", "fr30", 4, EM_FR30, 0, 0 },
 -  { "dv10", "elf_dv10", "dv10", 4, EM_D10V, 0, 0 },
 -  { "dv30", "elf_dv30", "dv30", 4, EM_D30V, 0, 0 },
 -  { "v850", "elf_v850", "v850", 4, EM_V850, 0, 0 },
 -  { "m32r", "elf_m32r", "m32r", 4, EM_M32R, 0, 0 },
 -  { "mn10300", "elf_mn10300", "mn10300", 7, EM_MN10300, 0, 0 },
 -  { "mn10200", "elf_mn10200", "mn10200", 7, EM_MN10200, 0, 0 },
 -  { "pj", "elf_pj", "pj", 2, EM_PJ, 0, 0 },
 -  { "openrisc", "elf_openrisc", "openrisc", 8, EM_OPENRISC, 0, 0 },
 -  { "arc", "elf_arc_a5", "arc_a5", 6, EM_ARC_A5, 0, 0 },
 -  { "xtensa", "elf_xtensa", "xtensa", 6, EM_XTENSA, 0, 0 },
 -  { "aarch64", "elf_aarch64", "aarch64", 7, EM_AARCH64, ELFCLASS64, 0 },
 -  { "bpf", "elf_bpf", "bpf", 3, EM_BPF, 0, 0 },
 -  { "riscv", "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS64, ELFDATA2LSB },
 -  { "riscv", "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS32, ELFDATA2LSB },
 +  { NULL, "elf_sh", "sh", 2, EM_SH, 0, 0 },
 +  { NULL, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
 +  { NULL, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
 +  { NULL, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
 +  { NULL, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
 +  { s390_init, "ebl_s390", "s390", 4, EM_S390, 0, 0 },
 +
 +  { NULL, "elf_m32", "m32", 3, EM_M32, 0, 0 },
 +  { NULL, "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
 +  { NULL, "elf_m88k", "m88k", 4, EM_88K, 0, 0 },
 +  { NULL, "elf_i860", "i860", 4, EM_860, 0, 0 },
 +  { NULL, "ebl_s370", "s370", 4, EM_S370, 0, 0 },
 +  { NULL, "elf_parisc", "parisc", 6, EM_PARISC, 0, 0 },
 +  { NULL, "elf_vpp500", "vpp500", 5, EM_VPP500, 0, 0 },
 +  { NULL, "elf_v8plus", "v8plus", 6, EM_SPARC32PLUS, 0, 0 },
 +  { NULL, "elf_i960", "i960", 4, EM_960, 0, 0 },
 +  { NULL, "ebl_v800", "v800", 4, EM_V800, 0, 0 },
 +  { NULL, "ebl_fr20", "fr20", 4, EM_FR20, 0, 0 },
 +  { NULL, "ebl_rh32", "rh32", 4, EM_RH32, 0, 0 },
 +  { NULL, "ebl_rce", "rce", 3, EM_RCE, 0, 0 },
 +  { NULL, "elf_tricore", "tricore", 7, EM_TRICORE, 0, 0 },
 +  { NULL, "elf_arc", "arc", 3, EM_ARC, 0, 0 },
 +  { NULL, "elf_h8_300", "h8_300", 6, EM_H8_300, 0, 0 },
 +  { NULL, "elf_h8_300h", "h8_300h", 6, EM_H8_300H, 0, 0 },
 +  { NULL, "elf_h8s", "h8s", 6, EM_H8S, 0, 0 },
 +  { NULL, "elf_h8_500", "h8_500", 6, EM_H8_500, 0, 0 },
 +  { NULL, "elf_coldfire", "coldfire", 8, EM_COLDFIRE, 0, 0 },
 +  { NULL, "elf_68hc12", "68hc12", 6, EM_68HC12, 0, 0 },
 +  { NULL, "elf_mma", "mma", 3, EM_MMA, 0, 0 },
 +  { NULL, "elf_pcp", "pcp", 3, EM_PCP, 0, 0 },
 +  { NULL, "elf_ncpu", "ncpu", 4, EM_NCPU, 0, 0 },
 +  { NULL, "elf_ndr1", "ndr1", 4, EM_NDR1, 0, 0 },
 +  { NULL, "elf_starcore", "starcore", 8, EM_STARCORE, 0, 0 },
 +  { NULL, "elf_me16", "em16", 4, EM_ME16, 0, 0 },
 +  { NULL, "elf_st100", "st100", 5, EM_ST100, 0, 0 },
 +  { NULL, "elf_tinyj", "tinyj", 5, EM_TINYJ, 0, 0 },
 +  { NULL, "elf_pdsp", "pdsp", 4, EM_PDSP, 0, 0 },
 +  { NULL, "elf_fx66", "fx66", 4, EM_FX66, 0, 0 },
 +  { NULL, "elf_st9plus", "st9plus", 7, EM_ST9PLUS, 0, 0 },
 +  { NULL, "elf_st7", "st7", 3, EM_ST7, 0, 0 },
 +  { NULL, "elf_68hc16", "68hc16", 6, EM_68HC16, 0, 0 },
 +  { NULL, "elf_68hc11", "68hc11", 6, EM_68HC11, 0, 0 },
 +  { NULL, "elf_68hc08", "68hc08", 6, EM_68HC08, 0, 0 },
 +  { NULL, "elf_68hc05", "68hc05", 6, EM_68HC05, 0, 0 },
 +  { NULL, "elf_svx", "svx", 3, EM_SVX, 0, 0 },
 +  { NULL, "elf_st19", "st19", 4, EM_ST19, 0, 0 },
 +  { NULL, "elf_vax", "vax", 3, EM_VAX, 0, 0 },
 +  { NULL, "elf_cris", "cris", 4, EM_CRIS, 0, 0 },
 +  { NULL, "elf_javelin", "javelin", 7, EM_JAVELIN, 0, 0 },
 +  { NULL, "elf_firepath", "firepath", 8, EM_FIREPATH, 0, 0 },
 +  { NULL, "elf_zsp", "zsp", 3, EM_ZSP, 0, 0 },
 +  { NULL, "elf_mmix", "mmix", 4, EM_MMIX, 0, 0 },
 +  { NULL, "elf_huany", "huany", 5, EM_HUANY, 0, 0 },
 +  { NULL, "elf_prism", "prism", 5, EM_PRISM, 0, 0 },
 +  { NULL, "elf_avr", "avr", 3, EM_AVR, 0, 0 },
 +  { NULL, "elf_fr30", "fr30", 4, EM_FR30, 0, 0 },
 +  { NULL, "elf_dv10", "dv10", 4, EM_D10V, 0, 0 },
 +  { NULL, "elf_dv30", "dv30", 4, EM_D30V, 0, 0 },
 +  { NULL, "elf_v850", "v850", 4, EM_V850, 0, 0 },
 +  { NULL, "elf_m32r", "m32r", 4, EM_M32R, 0, 0 },
 +  { NULL, "elf_mn10300", "mn10300", 7, EM_MN10300, 0, 0 },
 +  { NULL, "elf_mn10200", "mn10200", 7, EM_MN10200, 0, 0 },
 +  { NULL, "elf_pj", "pj", 2, EM_PJ, 0, 0 },
 +  { NULL, "elf_openrisc", "openrisc", 8, EM_OPENRISC, 0, 0 },
 +  { NULL, "elf_arc_a5", "arc_a5", 6, EM_ARC_A5, 0, 0 },
 +  { NULL, "elf_xtensa", "xtensa", 6, EM_XTENSA, 0, 0 },
 +  { aarch64_init, "elf_aarch64", "aarch64", 7, EM_AARCH64, ELFCLASS64, 0 },
 +  { bpf_init, "elf_bpf", "bpf", 3, EM_BPF, 0, 0 },
++  { NULL, "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS64, ELFDATA2LSB },
++  { NULL, "elf_riscv", "riscv", 5, EM_RISCV, ELFCLASS32, ELFDATA2LSB },
  };
  #define nmachines (sizeof (machines) / sizeof (machines[0]))
  

diff --cc libelf/Makefile.am
Simple merge

diff --cc tests/Makefile.am
index 483f3878ffb00a3cafe8c8da59d8d3be23dd0e8c,ecc2d68276903916ffaac6aefe2c0913c12e6409..e89163d58b526e95fd840d3f61c67d5b9beb306b
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -430,10 -479,11 +480,12 @@@ show_die_info_LDADD = $(libdw) $(libelf
  get_pubnames_LDADD = $(libdw) $(libelf)
  show_abbrev_LDADD = $(libdw) $(libelf)
  get_lines_LDADD = $(libdw) $(libelf)
+ next_lines_LDADD = $(libdw) $(libelf)
  get_files_LDADD = $(libdw) $(libelf)
+ next_files_LDADD = $(libdw) $(libelf)
  get_aranges_LDADD = $(libdw) $(libelf)
  allfcts_LDADD = $(libdw) $(libelf)
 +line2addr_no_Wformat = yes
  line2addr_LDADD = $(libdw) $(argp_LDADD)
  addrscopes_LDADD = $(libdw) $(argp_LDADD)
  funcscopes_LDADD = $(libdw) $(argp_LDADD)

diff --cc tests/run-addrcfi.sh
Simple merge

diff --cc tests/run-dwarfcfi.sh
index 0000000000000000000000000000000000000000,98fa171da3bb26edb3b42ee9fe7965fdf146984a..87691ae5ae1336c801a46b063ef6e6bf1cfc903f
mode 000000,100755..100755
--- /dev/null
--- 2/tests/run-dwarfcfi.sh
+++ b/tests/run-dwarfcfi.sh
@@@ -1,0 -1,133 +1,116 @@@
 -testfiles testfilearm-debugframe
 -testrun_compare ${abs_builddir}/dwarfcfi testfilearm-debugframe 0x00008510 <<\EOF
 -0x8510 => [0x8510, 0x8524):
 -      return address in reg14
 -      CFA location expression: bregx(13)
 -      reg0: undefined
 -      reg1: undefined
 -      reg2: undefined
 -      reg3: undefined
 -      reg4: same_value
 -      reg5: same_value
 -      reg6: same_value
 -      reg7: same_value
 -      reg8: same_value
 -      reg9: undefined
 -EOF
 -
+ #! /bin/sh
+ # Test for dwarf_getcfi.
+ # Copyright (C) 2018 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 the GNU General Public License as published by
+ # the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # 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 a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ . $srcdir/test-subr.sh
+ 
+ # Test files come from run-addrcfi with all sections stripped except
+ # the .debug_frame.
+ # for i in <testfiles>
+ #   eu-strip -f $i-debugframe $i
+ #   eu-strip -g --remove-comment --keep-section=.debug_frame $i-debugframe
+ # done
+ testfiles testfile11-debugframe testfile12-debugframe
+ testfiles testfileaarch64-debugframe
+ testfiles testfilearm-debugframe
+ testfiles testfileppc32-debugframe
+ testfiles testfileppc64-debugframe
+ 
+ testfiles testfile11-debugframe
+ testrun_compare ${abs_builddir}/dwarfcfi testfile11-debugframe 0x080489b8 <<\EOF
+ 0x80489b8 => [0x80489b8, 0x80489b9):
+       return address in reg8
+       CFA location expression: bregx(4,4)
+       reg0: undefined
+       reg1: undefined
+       reg2: undefined
+       reg3: same_value
+       reg4: location expression: call_frame_cfa stack_value
+       reg5: same_value
+       reg6: same_value
+       reg7: same_value
+       reg8: location expression: call_frame_cfa plus_uconst(-4)
+       reg9: undefined
+ EOF
+ 
+ testfiles testfile12-debugframe
+ testrun_compare ${abs_builddir}/dwarfcfi testfile12-debugframe 0x00000000000009d0 <<\EOF
+ 0x9d0 => [0x9d0, 0x9d1):
+       return address in reg16
+       CFA location expression: bregx(7,8)
+       reg0: same_value
+       reg1: undefined
+       reg2: undefined
+       reg3: undefined
+       reg4: undefined
+       reg5: undefined
+       reg6: same_value
+       reg7: location expression: call_frame_cfa stack_value
+       reg8: undefined
+       reg9: undefined
+ EOF
+ 
+ testfiles testfileppc32-debugframe
+ testrun_compare ${abs_builddir}/dwarfcfi testfileppc32-debugframe 0x100004c0 <<\EOF
+ 0x100004c0 => [0x100004c0, 0x100004d0):
+       return address in reg65
+       CFA location expression: bregx(1)
+       reg0: undefined
+       reg1: location expression: call_frame_cfa stack_value
+       reg2: same_value
+       reg3: undefined
+       reg4: undefined
+       reg5: undefined
+       reg6: undefined
+       reg7: undefined
+       reg8: undefined
+       reg9: undefined
+ EOF
+ 
+ testfiles testfileppc64-debugframe
+ testrun_compare ${abs_builddir}/dwarfcfi testfileppc64-debugframe 0x00000000100005b0 <<\EOF
+ 0x100005b0 => [0x100005b0, 0x100005d0):
+       return address in reg65
+       CFA location expression: bregx(1)
+       reg0: undefined
+       reg1: location expression: call_frame_cfa stack_value
+       reg2: same_value
+       reg3: undefined
+       reg4: undefined
+       reg5: undefined
+       reg6: undefined
+       reg7: undefined
+       reg8: undefined
+       reg9: undefined
+ EOF
+ 
+ testfiles testfileaarch64-debugframe
+ testrun_compare ${abs_builddir}/dwarfcfi testfileaarch64-debugframe 0x400550 <<\EOF
+ 0x400550 => [0x400550, 0x400568):
+       return address in reg30
+       CFA location expression: bregx(31)
+       reg0: undefined
+       reg1: undefined
+       reg2: undefined
+       reg3: undefined
+       reg4: undefined
+       reg5: undefined
+       reg6: undefined
+       reg7: undefined
+       reg8: undefined
+       reg9: undefined
+ EOF