From patchwork Wed Apr 6 09:10:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 912 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:47:19 -0000 Delivered-To: patches@linaro.org Received: by 10.204.151.92 with SMTP id b28cs10025bkw; Wed, 6 Apr 2011 02:10:45 -0700 (PDT) Received: by 10.216.55.145 with SMTP id k17mr895100wec.48.1302081043799; Wed, 06 Apr 2011 02:10:43 -0700 (PDT) Received: from mtagate4.uk.ibm.com (mtagate4.uk.ibm.com [194.196.100.164]) by mx.google.com with ESMTPS id 60si705271wet.162.2011.04.06.02.10.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 06 Apr 2011 02:10:42 -0700 (PDT) Received-SPF: neutral (google.com: 194.196.100.164 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=194.196.100.164; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.196.100.164 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) smtp.mail=ken.werner@linaro.org Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate4.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p369AY46005905 for ; Wed, 6 Apr 2011 09:10:34 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p369BGpn1794206 for ; Wed, 6 Apr 2011 10:11:16 +0100 Received: from d06av07.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p369AX1x009193 for ; Wed, 6 Apr 2011 03:10:33 -0600 Received: from localhost.localdomain (dyn-9-152-224-51.boeblingen.de.ibm.com [9.152.224.51]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p369AWHF009138; Wed, 6 Apr 2011 03:10:33 -0600 From: Ken Werner To: arun@sharma-home.net, ppluzhnikov@google.com Cc: libunwind-devel@nongnu.org Subject: [PATCH] Add the appropriate libraries to the *_LDADD variables. Date: Wed, 6 Apr 2011 11:10:11 +0200 Message-Id: <1302081011-12833-2-git-send-email-ken.werner@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1302081011-12833-1-git-send-email-ken.werner@linaro.org> References: <1302081011-12833-1-git-send-email-ken.werner@linaro.org> The test-async-sig.c, test-flush-cache.c and Ltest_resume_sig.c define UNW_LOCAL_ONLY and therefore only need LIBUNWIND_local. Gtest-dyn1.c is calling '_U_dyn_cancel' and test-trace.c is using 'unw_backtrace' which are in LIBUNWIND_local. Signed-off-by: Ken Werner --- tests/Makefile.am | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d5e3ae2..59ad3b3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -107,7 +107,7 @@ Ltest_nocalloc_SOURCES = Ltest-nocalloc.c Gtest_trace_SOURCES = Gtest-trace.c ident.c Ltest_trace_SOURCES = Ltest-trace.c ident.c -LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la $(LIBUNWIND_local) +LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.a if USE_ELF32 @@ -123,8 +123,8 @@ endif LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \ $(LIBUNWIND_ELF) $(LIBUNWIND) -test_async_sig_LDADD = $(LIBUNWIND) -lpthread -test_flush_cache_LDADD = $(LIBUNWIND) +test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread +test_flush_cache_LDADD = $(LIBUNWIND_local) test_init_remote_LDADD = $(LIBUNWIND) test_mem_LDADD = $(LIBUNWIND) test_ptrace_LDADD = $(LIBUNWIND_ptrace) $(LIBUNWIND) @@ -136,12 +136,12 @@ test_varargs_LDADD = @BACKTRACELIB@ Gtest_bt_LDADD = $(LIBUNWIND) Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread -Gtest_dyn1_LDADD = $(LIBUNWIND) +Gtest_dyn1_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) Gtest_exc_LDADD = $(LIBUNWIND) Gtest_init_LDADD = $(LIBUNWIND) Gtest_resume_sig_LDADD = $(LIBUNWIND) Gperf_simple_LDADD = $(LIBUNWIND) -Gtest_trace_LDADD=$(LIBUNWIND) +Gtest_trace_LDADD=$(LIBUNWIND) $(LIBUNWIND_local) Gperf_trace_LDADD = $(LIBUNWIND) Ltest_bt_LDADD = $(LIBUNWIND_local) @@ -151,7 +151,7 @@ Ltest_exc_LDADD = $(LIBUNWIND_local) Ltest_init_LDADD = $(LIBUNWIND_local) Ltest_nomalloc_LDADD = $(LIBUNWIND_local) @DLLIB@ Ltest_nocalloc_LDADD = $(LIBUNWIND_local) @DLLIB@ -lpthread -Ltest_resume_sig_LDADD = $(LIBUNWIND) +Ltest_resume_sig_LDADD = $(LIBUNWIND_local) Lperf_simple_LDADD = $(LIBUNWIND_local) Ltest_trace_LDADD = $(LIBUNWIND_local) Lperf_trace_LDADD = $(LIBUNWIND_local)