From patchwork Fri Nov 18 18:00:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Werner X-Patchwork-Id: 5213 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E1A6E23FFE for ; Fri, 18 Nov 2011 18:00:37 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id D1D61A183DA for ; Fri, 18 Nov 2011 18:00:37 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so8341882faa.11 for ; Fri, 18 Nov 2011 10:00:37 -0800 (PST) Received: by 10.152.105.226 with SMTP id gp2mr2659843lab.28.1321639237689; Fri, 18 Nov 2011 10:00:37 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs24676lal; Fri, 18 Nov 2011 10:00:37 -0800 (PST) Received: by 10.216.230.18 with SMTP id i18mr687377weq.6.1321639235919; Fri, 18 Nov 2011 10:00:35 -0800 (PST) Received: from mtagate7.uk.ibm.com (mtagate7.uk.ibm.com. [194.196.100.167]) by mx.google.com with ESMTPS id 7si899881wel.50.2011.11.18.10.00.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Nov 2011 10:00:35 -0800 (PST) Received-SPF: neutral (google.com: 194.196.100.167 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) client-ip=194.196.100.167; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.196.100.167 is neither permitted nor denied by best guess record for domain of ken.werner@linaro.org) smtp.mail=ken.werner@linaro.org Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pAII0Z1p010362; Fri, 18 Nov 2011 18:00:35 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAII0Yxc1974380; Fri, 18 Nov 2011 18:00:34 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAII0P3l028502; Fri, 18 Nov 2011 11:00:25 -0700 Received: from kiste.boeblingen.de.ibm.com (dyn-9-152-224-38.boeblingen.de.ibm.com [9.152.224.38]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAII0K4h028262; Fri, 18 Nov 2011 11:00:24 -0700 From: Ken Werner To: libunwind-devel@nongnu.org Cc: Ken Werner Subject: [PATCH] [ARM] Call dwarf_step only if CONFIG_DEBUG_FRAME is defined Date: Fri, 18 Nov 2011 19:00:15 +0100 Message-Id: <1321639215-14537-2-git-send-email-ken.werner@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321639215-14537-1-git-send-email-ken.werner@linaro.org> References: <1321639215-14537-1-git-send-email-ken.werner@linaro.org> The ARM EABI does not use the .eh_frame and .eh_frame_hdr sections for unwinding. Therefore it doesn't make sense to call dwarf_step if CONFIG_DEBUG_FRAME is not defined. --- src/arm/Gstep.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/arm/Gstep.c b/src/arm/Gstep.c index 149a65a..3b7bdbe 100644 --- a/src/arm/Gstep.c +++ b/src/arm/Gstep.c @@ -171,6 +171,7 @@ unw_step (unw_cursor_t *cursor) if (unw_is_signal_frame (cursor)) return unw_handle_signal_frame (cursor); +#ifdef CONFIG_DEBUG_FRAME /* First, try DWARF-based unwinding. */ if (UNW_TRY_METHOD(UNW_ARM_METHOD_DWARF)) { @@ -188,6 +189,7 @@ unw_step (unw_cursor_t *cursor) return ret; } } +#endif /* CONFIG_DEBUG_FRAME */ /* Next, try extbl-based unwinding. */ if (UNW_TRY_METHOD (UNW_ARM_METHOD_EXIDX))