From: Mark Wielaard <mark@klomp.org>
Date: Thu, 27 May 2021 13:25:52 +0000 (+0200)
Subject: Merge tag 'elfutils-0.185' into mjw/RH-DTS
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2316416971ef9c9367d6383c7fb8ca382d8303b2;p=thirdparty%2Felfutils.git

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

elfutils 0.185 release
---

2316416971ef9c9367d6383c7fb8ca382d8303b2
diff --cc debuginfod/Makefile.am
index 8b07ed0b6,3adb27559..79677afe0
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@@ -71,17 -70,16 +70,17 @@@ bin_PROGRAMS += debuginfod-fin
  endif
  
  debuginfod_SOURCES = debuginfod.cxx
- debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
+ debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
  
  debuginfod_find_SOURCES = debuginfod-find.c
- debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod)
+ debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)
  
  if LIBDEBUGINFOD
 -noinst_LIBRARIES = libdebuginfod.a
 -noinst_LIBRARIES += libdebuginfod_pic.a
 +lib_LIBRARIES = libdebuginfod.a
 +noinst_LIBRARIES = libdebuginfod_pic.a
  endif
  
 +libdebuginfod_a_CFLAGS = -fPIC $(AM_CFLAGS)
  libdebuginfod_a_SOURCES = debuginfod-client.c
  libdebuginfod_pic_a_SOURCES = debuginfod-client.c
  am_libdebuginfod_pic_a_OBJECTS = $(libdebuginfod_a_SOURCES:.c=.os)
diff --cc libasm/Makefile.am
index a92b63adc,c2b548115..6a1914658
--- a/libasm/Makefile.am
+++ b/libasm/Makefile.am
@@@ -35,10 -34,9 +34,10 @@@ VERSION = 
  
  lib_LIBRARIES = libasm.a
  noinst_LIBRARIES = libasm_pic.a
- noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so)
+ noinst_DATA = $(noinst_LIBRARIES:_pic.a=.so)
  pkginclude_HEADERS = libasm.h
  
 +libasm_a_CFLAGS = -fPIC $(AM_CFLAGS)
  libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \
  		   asm_getelf.c asm_newscn.c asm_newscn_ingrp.c \
  		   asm_newsubscn.c asm_newsym.c asm_newcomsym.c \
diff --cc tests/Makefile.am
index 0a7766929,dc7517d90..6f19007af
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -182,9 -182,13 +181,12 @@@ TESTS = run-arextract.sh run-arsymtest.
  	run-readelf-discr.sh \
  	run-dwelf_elf_e_machine_string.sh \
  	run-elfclassify.sh run-elfclassify-self.sh \
 -	run-disasm-riscv64.sh \
  	run-pt_gnu_prop-tests.sh \
  	run-getphdrnum.sh run-test-includes.sh \
- 	leb128 read_unaligned
+ 	leb128 read_unaligned \
+ 	msg_tst system-elf-libelf-test \
+ 	$(asm_TESTS) run-disasm-bpf.sh run-low_high_pc-dw-form-indirect.sh \
+ 	run-readelf-dw-form-indirect.sh
  
  if !BIARCH
  export ELFUTILS_DISABLE_BIARCH = 1