From patchwork Mon Sep 27 22:26:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 65922 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 A6962B70E0 for ; Tue, 28 Sep 2010 08:27:55 +1000 (EST) Received: (qmail 24265 invoked by alias); 27 Sep 2010 22:27:53 -0000 Received: (qmail 24254 invoked by uid 22791); 27 Sep 2010 22:27:52 -0000 X-SWARE-Spam-Status: No, hits=-5.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 27 Sep 2010 22:27:47 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8RMQkYb019305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Sep 2010 18:26:46 -0400 Received: from anchor.twiddle.home (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8RMQjOv000338; Mon, 27 Sep 2010 18:26:45 -0400 Message-ID: <4CA11A25.5090901@redhat.com> Date: Mon, 27 Sep 2010 15:26:45 -0700 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc13 Thunderbird/3.1.4 MIME-Version: 1.0 To: sje@cup.hp.com CC: GCC Patches Subject: Re: [RFC/CFT] Hookize TARGET_UNWIND_INFO and related macros References: <4C87EF7D.9080801@redhat.com> <4C9D180D.4080409@redhat.com> <1285603747.9806.141.camel@hpsje.cup.hp.com> <4CA0F01B.7040306@redhat.com> In-Reply-To: <4CA0F01B.7040306@redhat.com> X-IsSubscribed: yes 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 09/27/2010 12:27 PM, Richard Henderson wrote: > On 09/27/2010 09:09 AM, Steve Ellcey wrote: >> I tried using this patch and the stage2/stage3 comparision failed on >> most files, for both ia64 HP-UX and Linux. If I compile cfg.o to a .s >> file and do a diff I see: > > Got it. The real difference is: > > alloc r34 = ar.pfs, 1, 3, 1, 0 > +.LCFI0: > addl r14 = @ltoffx(_xexit_cleanup#), r1 > > i.e. the dwarf2 cfi stuff isn't creating debug labels, > which means we break the bundle and add nops where we > didn't want em. > > Hopefully I'll have a new patch this afternoon so you > can do overnight tests. Whee. Tested along with the T_U_I patch on ia64-linux and committed. r~ * dwarf2out.c (dwarf2out_cfi_label): Use ASM_OUTPUT_DEBUG_LABEL. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 900994d..cb3a21f 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -790,8 +790,9 @@ dwarf2out_cfi_label (bool force) } else { - ASM_GENERATE_INTERNAL_LABEL (label, "LCFI", dwarf2out_cfi_label_num++); - ASM_OUTPUT_LABEL (asm_out_file, label); + int num = dwarf2out_cfi_label_num++; + ASM_GENERATE_INTERNAL_LABEL (label, "LCFI", num); + ASM_OUTPUT_DEBUG_LABEL (asm_out_file, "LCFI", num); } return label;