From patchwork Wed Mar 2 16:40:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 282 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 c16cs193813qab; Wed, 2 Mar 2011 08:40:14 -0800 (PST) Received: by 10.213.19.207 with SMTP id c15mr325238ebb.76.1299084014077; Wed, 02 Mar 2011 08:40:14 -0800 (PST) Received: from mtagate5.uk.ibm.com (mtagate5.uk.ibm.com [194.196.100.165]) by mx.google.com with ESMTPS id w59si295462eeh.89.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.165 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=194.196.100.165; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.196.100.165 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 mtagate5.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p22GeCwD009451 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 p22GeNWt1757328 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 p22GeB0T000332 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 p22GeA0L000307; Wed, 2 Mar 2011 09:40:11 -0700 From: Ken Werner To: libunwind-devel@nongnu.org Subject: [PATCH 2/5] Use UNW_OBJ instead of UNWI_ARCH_OBJ to rename unwi_unwind_method on ARM. Date: Wed, 2 Mar 2011 17:40:07 +0100 Message-Id: <1299084010-8762-3-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 results in different unwi_unwind_method symbol names for the local and generic versions. It allows to statically link against both libraries. Signed-off-by: Ken Werner --- include/tdep-arm/libunwind_i.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tdep-arm/libunwind_i.h b/include/tdep-arm/libunwind_i.h index bae9c4d..5f02ed0 100644 --- a/include/tdep-arm/libunwind_i.h +++ b/include/tdep-arm/libunwind_i.h @@ -260,7 +260,7 @@ extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, #define UNW_ARM_METHOD_DWARF 0x01 #define UNW_ARM_METHOD_FRAME 0x02 -#define unwi_unwind_method UNWI_ARCH_OBJ(unwind_method) +#define unwi_unwind_method UNW_OBJ(unwind_method) extern int unwi_unwind_method; #define UNW_TRY_METHOD(x) (unwi_unwind_method & x)