This adds support for linkers that do not pull in the dependent shared libraries of libunwind-$(arch).la and libunwind-setjmp.la implicitly.
Signed-off-by: Ken Werner <[email protected]> --- tests/Makefile.am | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0ab7b78..4d86445 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -99,27 +99,28 @@ Ltest_bt_SOURCES = Ltest-bt.c ident.c test_ptrace_misc_SOURCES = test-ptrace-misc.c ident.c Ltest_nomalloc_SOURCES = Ltest-nomalloc.c -LIBUNWIND_generic = $(top_builddir)/src/libunwind-$(arch).la +LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la $(LIBUNWIND_local) LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.a -LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la - -test_async_sig_LDADD = $(LIBUNWIND_generic) -lpthread -test_flush_cache_LDADD = $(LIBUNWIND_generic) -test_init_remote_LDADD = $(LIBUNWIND_generic) -test_mem_LDADD = $(LIBUNWIND_generic) -test_ptrace_LDADD = $(LIBUNWIND_ptrace) $(LIBUNWIND_generic) -test_proc_info_LDADD = $(LIBUNWIND_generic) -test_static_link_LDADD = $(LIBUNWIND_generic) -test_strerror_LDADD = $(LIBUNWIND_generic) -rs_race_LDADD = $(LIBUNWIND_generic) -lpthread - -Gtest_bt_LDADD = $(LIBUNWIND_generic) -Gtest_concurrent_LDADD = $(LIBUNWIND_generic) -lpthread -Gtest_dyn1_LDADD = $(LIBUNWIND_generic) -Gtest_exc_LDADD = $(LIBUNWIND_generic) -Gtest_init_LDADD = $(LIBUNWIND_generic) -Gtest_resume_sig_LDADD = $(LIBUNWIND_generic) -Gperf_simple_LDADD = $(LIBUNWIND_generic) +LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \ + $(top_builddir)/src/libunwind-elf32.la $(LIBUNWIND) + +test_async_sig_LDADD = $(LIBUNWIND) -lpthread +test_flush_cache_LDADD = $(LIBUNWIND) +test_init_remote_LDADD = $(LIBUNWIND) +test_mem_LDADD = $(LIBUNWIND) +test_ptrace_LDADD = $(LIBUNWIND_ptrace) $(LIBUNWIND) +test_proc_info_LDADD = $(LIBUNWIND) +test_static_link_LDADD = $(LIBUNWIND) +test_strerror_LDADD = $(LIBUNWIND) +rs_race_LDADD = $(LIBUNWIND) -lpthread + +Gtest_bt_LDADD = $(LIBUNWIND) +Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread +Gtest_dyn1_LDADD = $(LIBUNWIND) +Gtest_exc_LDADD = $(LIBUNWIND) +Gtest_init_LDADD = $(LIBUNWIND) +Gtest_resume_sig_LDADD = $(LIBUNWIND) +Gperf_simple_LDADD = $(LIBUNWIND) Ltest_bt_LDADD = $(LIBUNWIND_local) Ltest_concurrent_LDADD = $(LIBUNWIND_local) -lpthread @@ -127,8 +128,8 @@ Ltest_dyn1_LDADD = $(LIBUNWIND_local) Ltest_exc_LDADD = $(LIBUNWIND_local) Ltest_init_LDADD = $(LIBUNWIND_local) Ltest_nomalloc_LDADD = $(LIBUNWIND_local) @DLLIB@ -Ltest_resume_sig_LDADD = $(LIBUNWIND_generic) +Ltest_resume_sig_LDADD = $(LIBUNWIND) Lperf_simple_LDADD = $(LIBUNWIND_local) -test_setjmp_LDADD = $(LIBUNWIND_setjmp) $(LIBUNWIND_local) -ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) $(LIBUNWIND_local) +test_setjmp_LDADD = $(LIBUNWIND_setjmp) +ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) -- 1.7.4.1 _______________________________________________ Libunwind-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/libunwind-devel
