From patchwork Wed Mar 2 16:40:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 283 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 c16cs193810qab; Wed, 2 Mar 2011 08:40:13 -0800 (PST) Received: by 10.216.186.144 with SMTP id w16mr7556642wem.13.1299084013201; Wed, 02 Mar 2011 08:40:13 -0800 (PST) Received: from mtagate1.uk.ibm.com (mtagate1.uk.ibm.com [194.196.100.161]) by mx.google.com with ESMTPS id f6si304325wed.36.2011.03.02.08.40.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 08:40:13 -0800 (PST) Received-SPF: neutral (google.com: 194.196.100.161 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=194.196.100.161; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.196.100.161 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) smtp.mail=ken.werner@linaro.org Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p22GeCcZ006181 for ; Wed, 2 Mar 2011 16:40:12 GMT Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p22GeNWB1847406 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 p22GeCHh000340 for ; Wed, 2 Mar 2011 09:40:12 -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 p22GeA0M000307; Wed, 2 Mar 2011 09:40:11 -0700 From: Ken Werner To: libunwind-devel@nongnu.org Subject: [PATCH 3/5] Link libunwind-setjmp against libunwind-elf. Date: Wed, 2 Mar 2011 17:40:08 +0100 Message-Id: <1299084010-8762-4-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 prevents the linker from complaining about a missing symbol when building the test-setjmp test case. Signed-off-by: Ken Werner --- src/Makefile.am | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index be7afaa..b87cbab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,20 @@ noinst_HEADERS += ptrace/_UPT_internal.h ### libunwind-setjmp: libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \ -version-info $(SETJMP_SO_VERSION) -libunwind_setjmp_la_LIBADD = libunwind-$(arch).la -lc + +if USE_ELF32 +LIBUNWIND_ELF = libunwind-elf32.la +endif +if USE_ELF64 +LIBUNWIND_ELF = libunwind-elf64.la +endif +if USE_ELFXX +LIBUNWIND_ELF = libunwind-elfxx.la +endif + +libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \ + libunwind-$(arch).la \ + libunwind.la -lc libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \ setjmp/siglongjmp.c noinst_HEADERS += setjmp/setjmp_i.h @@ -118,18 +131,8 @@ libunwind_elf32_la_SOURCES = elf32.c libunwind_elf64_la_SOURCES = elf64.c libunwind_elfxx_la_SOURCES = elfxx.c -if USE_ELF32 -noinst_LTLIBRARIES += libunwind-elf32.la -libunwind_la_LIBADD += libunwind-elf32.la -endif -if USE_ELF64 -noinst_LTLIBRARIES += libunwind-elf64.la -libunwind_la_LIBADD += libunwind-elf64.la -endif -if USE_ELFXX -noinst_LTLIBRARIES += libunwind-elfxx.la -libunwind_la_LIBADD += libunwind-elfxx.la -endif +noinst_LTLIBRARIES += $(LIBUNWIND_ELF) +libunwind_la_LIBADD += $(LIBUNWIND_ELF) # The list of files that go into libunwind and libunwind-arm: noinst_HEADERS += arm/init.h arm/offsets.h arm/unwind_i.h