From patchwork Wed Mar 2 16:40:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 284 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:41:26 -0000 Delivered-To: patches@linaro.org Received: by 10.224.19.208 with SMTP id c16cs193809qab; Wed, 2 Mar 2011 08:40:13 -0800 (PST) Received: by 10.213.9.134 with SMTP id l6mr516368ebl.45.1299084012851; Wed, 02 Mar 2011 08:40:12 -0800 (PST) Received: from mtagate6.uk.ibm.com (mtagate6.uk.ibm.com [194.196.100.166]) by mx.google.com with ESMTPS id y2si309080eeh.61.2011.03.02.08.40.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 08:40:12 -0800 (PST) Received-SPF: neutral (google.com: 194.196.100.166 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=194.196.100.166; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.196.100.166 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) smtp.mail=ken.werner@linaro.org Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p22GeBGH014383 for ; Wed, 2 Mar 2011 16:40:11 GMT Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p22GeNsT1810626 for ; Wed, 2 Mar 2011 16:40:23 GMT Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p22GeBn2000323 for ; Wed, 2 Mar 2011 09:40:11 -0700 Received: from localhost.localdomain (dyn-9-152-224-51.boeblingen.de.ibm.com [9.152.224.51]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p22GeA0K000307; Wed, 2 Mar 2011 09:40:11 -0700 From: Ken Werner To: libunwind-devel@nongnu.org Subject: [PATCH 1/5] Explicitly add dependent shared libraries. Date: Wed, 2 Mar 2011 17:40:06 +0100 Message-Id: <1299084010-8762-2-git-send-email-ken.werner@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1299084010-8762-1-git-send-email-ken.werner@linaro.org> References: <1299084010-8762-1-git-send-email-ken.werner@linaro.org> 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 --- 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)