From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10716 invoked by alias); 31 Jul 2012 23:17:11 -0000 Received: (qmail 10707 invoked by uid 22791); 31 Jul 2012 23:17:10 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,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; Tue, 31 Jul 2012 23:16:54 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6VNGrf8002199 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 31 Jul 2012 19:16:53 -0400 Received: from pebble.twiddle.home (vpn-11-250.rdu.redhat.com [10.11.11.250]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6VNGqHZ004394; Tue, 31 Jul 2012 19:16:53 -0400 Message-ID: <50186763.70101@redhat.com> Date: Tue, 31 Jul 2012 23:21:00 -0000 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: DJ Delorie CC: gcc-patches@gcc.gnu.org Subject: Re: TPF: disable discriminators References: <201207310407.q6V47qIe028859@greed.delorie.com> <501806B6.7020409@redhat.com> <201207312109.q6VL9SCl027555@greed.delorie.com> <50185541.5040400@redhat.com> <201207312221.q6VMLlVb019866@greed.delorie.com> <50185B72.7040100@redhat.com> <201207312251.q6VMpU9b021892@greed.delorie.com> In-Reply-To: <201207312251.q6VMpU9b021892@greed.delorie.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2012-07/txt/msg01597.txt.bz2 On 2012-07-31 15:51, DJ Delorie wrote: >> I don't see that 4.6 requires a different patch. > > 4.6 is missing this: > > 2011-04-01 Richard Henderson > > PR 48400 > * dwarf2out.c (dwarf2out_source_line): Disable discriminators > in strict mode before dwarf4. Re-order tests to early out > before switching sections. > > So either *that* patch needs to be back-ported, or the tpf-specific > workaround does. > In 4.6 we do not emit discriminators except with DWARF2_ASM_LINE_DEBUG_INFO, and in that section we have if (SUPPORTS_DISCRIMINATOR && discriminator != 0 && (dwarf_version >= 4 || !dwarf_strict)) fprintf (asm_out_file, " discriminator %d", discriminator); and sure enough dwarf_strict is honored. That patch is only required if you have the other patches that introduce discriminators to the non-dwarf2_asm_line path. r~