From patchwork Thu Aug 5 15:40:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 60999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 6329E1007D2 for ; Fri, 6 Aug 2010 01:41:01 +1000 (EST) Received: (qmail 25792 invoked by alias); 5 Aug 2010 15:40:59 -0000 Received: (qmail 25781 invoked by uid 22791); 5 Aug 2010 15:40:58 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from b.mail.sonic.net (HELO b.mail.sonic.net) (64.142.19.5) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 05 Aug 2010 15:40:25 +0000 Received: from are.twiddle.net (are.twiddle.net [75.101.38.216]) by b.mail.sonic.net (8.13.8.Beta0-Sonic/8.13.7) with ESMTP id o75FeN2w000351 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Aug 2010 08:40:23 -0700 Received: from anchor.twiddle.home (anchor.twiddle.home [172.31.0.4]) by are.twiddle.net (8.14.4/8.14.4) with ESMTP id o75FeMmb007204; Thu, 5 Aug 2010 08:40:22 -0700 Message-ID: <4C5ADB66.2050807@twiddle.net> Date: Thu, 05 Aug 2010 08:40:22 -0700 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.7) Gecko/20100720 Fedora/3.1.1-1.fc13 Thunderbird/3.1.1 MIME-Version: 1.0 To: "H.J. Lu" CC: gcc-patches@gcc.gnu.org, kai.tietz@onevision.com, ubizjak@gmail.com Subject: Re: [PATCH 6/9] Emit the prologue/epilogue using frame offsets. References: <1280879596-1089-1-git-send-email-rth@twiddle.net> <1280879596-1089-7-git-send-email-rth@twiddle.net> In-Reply-To: Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 08/05/2010 07:10 AM, H.J. Lu wrote: > This caused: > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45189 Fixed. r~ diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b5c8ad..4aeb014 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-08-05 Richard Henderson + + * dwarf2out.c (DWARF2_UNWIND_INFO): Provide default definition. + (INCOMING_RETURN_ADDR_RTX): Likewise. + (dwarf2out_do_frame): Remove conditional compilation. + (dwarf2out_frame_init): Likewise. + 2010-08-05 Martin Jambor * ipa-cp.c (ipcp_discover_new_direct_edges): New function. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 2c79c69..8e6f94f 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -112,6 +112,14 @@ int vms_file_stats_name (const char *, long long *, long *, char *, int *); #define DWARF2_INDIRECT_STRING_SUPPORT_MISSING_ON_TARGET 0 #endif +#ifndef DWARF2_UNWIND_INFO +#define DWARF2_UNWIND_INFO 0 +#endif + +#ifndef INCOMING_RETURN_ADDR_RTX +#define INCOMING_RETURN_ADDR_RTX (gcc_unreachable (), NULL_RTX) +#endif + #ifndef DWARF2_FRAME_INFO # ifdef DWARF2_DEBUGGING_INFO # define DWARF2_FRAME_INFO \ @@ -143,11 +151,9 @@ dwarf2out_do_frame (void) return (write_symbols == DWARF2_DEBUG || write_symbols == VMS_AND_DWARF2_DEBUG || DWARF2_FRAME_INFO || saved_do_cfi_asm -#ifdef DWARF2_UNWIND_INFO || (DWARF2_UNWIND_INFO && (flag_unwind_tables || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS))) -#endif ); } @@ -4153,10 +4159,8 @@ dwarf2out_frame_init (void) /* On entry, the Canonical Frame Address is at SP. */ dwarf2out_def_cfa (NULL, STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET); -#ifdef DWARF2_UNWIND_INFO if (DWARF2_UNWIND_INFO || DWARF2_FRAME_INFO) initial_return_save (INCOMING_RETURN_ADDR_RTX); -#endif } void