1From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001 2From: Hongxu Jia <hongxu.jia@windriver.com> 3Date: Tue, 15 Aug 2017 17:10:57 +0800 4Subject: [PATCH] dso link change 5 6Upstream-Status: Pending 7 8This patch makes the link to the dependencies of libdw explicit, as 9recent ld no longer implicitly links them. See 10http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html 11as a similar example of the error message you can encounter without this 12patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and 13https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for 14more details. 15 16Rebase to 0.170 17 18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 19 20--- 21 src/Makefile.am | 2 +- 22 tests/Makefile.am | 2 +- 23 2 files changed, 2 insertions(+), 2 deletions(-) 24 25diff --git a/src/Makefile.am b/src/Makefile.am 26index 88d0ac8..c28d81f 100644 27--- a/src/Makefile.am 28+++ b/src/Makefile.am 29@@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread 30 libelf = ../libelf/libelf.a -lz 31 else 32 libasm = ../libasm/libasm.so 33-libdw = ../libdw/libdw.so 34+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl 35 libelf = ../libelf/libelf.so 36 endif 37 libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a 38diff --git a/tests/Makefile.am b/tests/Makefile.am 39index c145720..72afd0e 100644 40--- a/tests/Makefile.am 41+++ b/tests/Makefile.am 42@@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread 43 libelf = ../libelf/libelf.a -lz 44 libasm = ../libasm/libasm.a 45 else 46-libdw = ../libdw/libdw.so 47+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl 48 libelf = ../libelf/libelf.so 49 libasm = ../libasm/libasm.so 50 endif 51