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