| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 1 | From c5fb59ac0819b5b6d8244c613cbcf92cb09840c1 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 17:10:57 +0800 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 4 | Subject: [PATCH] dso link change |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | This patch makes the link to the dependencies of libdw explicit, as |
| 9 | recent ld no longer implicitly links them. See |
| 10 | http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html |
| 11 | as a similar example of the error message you can encounter without this |
| 12 | patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and |
| 13 | https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for |
| 14 | more details. |
| 15 | |
| 16 | Rebase to 0.170 |
| 17 | |
| 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | --- |
| 21 | src/Makefile.am | 2 +- |
| 22 | tests/Makefile.am | 2 +- |
| 23 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 24 | |
| 25 | diff --git a/src/Makefile.am b/src/Makefile.am |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 26 | index 88d0ac8..c28d81f 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | --- a/src/Makefile.am |
| 28 | +++ b/src/Makefile.am |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 29 | @@ -45,7 +45,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 37 | libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 38 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 39 | index c145720..72afd0e 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 40 | --- a/tests/Makefile.am |
| 41 | +++ b/tests/Makefile.am |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 42 | @@ -554,7 +554,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |