From: Mark Wielaard <mark@klomp.org>
Date: Wed, 11 Jan 2017 21:17:39 +0000 (+0100)
Subject: Merge tag 'elfutils-0.168' into mjw/RH-DTS
X-Git-Tag: dts-0.168~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1376b3517d548f74c12bfcfb74f9412e5df39ebf;p=thirdparty%2Felfutils.git

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

elfutils 0.168 release

Conflicts:
	src/Makefile.am
	tests/Makefile.am
---

1376b3517d548f74c12bfcfb74f9412e5df39ebf
diff --cc src/Makefile.am
index deba8dcad,2b1c0dcbc..657b21a28
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -73,12 -71,12 +73,12 @@@ readelf_LDADD = $(libdw) $(libebl) $(li
  nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \
  	   $(demanglelib)
  size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
- strip_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD) -ldl
+ strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
 -elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 +elflint_LDADD  = $(libebl) $(libdw_static) $(libelf) $(libeu) $(argp_LDADD) -ldl
- findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD)
- addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib)
- elfcmp_LDADD = $(libebl) $(libdw_static) $(libelf) $(argp_LDADD) -ldl
+ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
+ addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
 -elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 -objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
++elfcmp_LDADD = $(libebl) $(libdw_static) $(libeu) $(libelf) $(argp_LDADD) -ldl
 +objdump_LDADD  = $(libasm) $(libebl) $(libdw_static) $(libelf) $(libeu) $(argp_LDADD) -ldl
  ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
  strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
  ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
diff --cc tests/Makefile.am
index 76502fb65,d4659cdb1..307d966a5
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -78,11 -78,11 +78,11 @@@ TESTS = run-arextract.sh run-arsymtest.
  	newscn run-strip-test.sh run-strip-test2.sh \
  	run-strip-test3.sh run-strip-test4.sh run-strip-test5.sh \
  	run-strip-test6.sh run-strip-test7.sh run-strip-test8.sh \
 -	run-strip-test9.sh run-strip-test10.sh run-strip-test11.sh \
 +	run-strip-test9.sh run-strip-test10.sh \
  	run-strip-groups.sh run-strip-reloc.sh run-strip-strmerge.sh \
  	run-strip-nobitsalign.sh \
- 	run-unstrip-test.sh run-unstrip-test2.sh \
- 	run-unstrip-test3.sh run-unstrip-M.sh run-elfstrmerge-test.sh \
+ 	run-unstrip-test.sh run-unstrip-test2.sh run-unstrip-test3.sh \
+ 	run-unstrip-test4.sh run-unstrip-M.sh run-elfstrmerge-test.sh \
  	run-ecp-test.sh run-ecp-test2.sh run-alldts.sh \
  	run-elflint-test.sh run-elflint-self.sh run-ranlib-test.sh \
  	run-ranlib-test2.sh run-ranlib-test3.sh run-ranlib-test4.sh \