From patchwork Wed Oct 17 09:21:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Clifton X-Patchwork-Id: 191992 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 C25382C00B0 for ; Wed, 17 Oct 2012 20:28:38 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1351070919; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=8WcqtHB8pRs2gHnACZPH yC0J2N8=; b=a0GjwCQbKeFDasFaEi3QOtNEj5T7w9p/EkUrXdNecZ9nxcZ+amE4 5+t+Vs/A7sfoLqOlU+tv4GA9XCXYNTETCXGzoOmAhg+49eZOhrIVN57Vd7AfIEMU X/kZbTaxq1V7FVU4zPmaqUYdz/3zYdj8QiLF9UsiZ3kFKuxdFqcNAKQ= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=JWCszqmqNJM//yeIQCT3jEQUPKlX2M/ut5j4BUM8xlIAcnd+nJNsVpPapx+1YN ec37csPcepUYYiquvpt1NaAbuFV9q787J2PWWuD2fL8+KqiM9QnEMmGGBN/PYyJ2 1b9Q4rQlptP+kWQskt4hrqasbikj8ICCf1NCLNg6zIZ9E=; Received: (qmail 12954 invoked by alias); 17 Oct 2012 09:28:31 -0000 Received: (qmail 12946 invoked by uid 22791); 17 Oct 2012 09:28:29 -0000 X-SWARE-Spam-Status: No, hits=-7.1 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS 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; Wed, 17 Oct 2012 09:28:21 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9H9SLh8021413 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 17 Oct 2012 05:28:21 -0400 Received: from [10.36.4.144] (vpn1-4-144.ams2.redhat.com [10.36.4.144]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9H9SJdH030761 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Wed, 17 Oct 2012 05:28:20 -0400 Message-ID: <507E7897.1030806@redhat.com> Date: Wed, 17 Oct 2012 10:21:27 +0100 From: nick clifton User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121009 Thunderbird/16.0 MIME-Version: 1.0 To: Steven Bosscher CC: GCC Patches Subject: Re: [patch] unbreak iq2000 build a bit References: In-Reply-To: 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 Hi Steven, > iq2000 build is broken since at least r162089 (July 2010). I'm going > to commit this patch to fix this part of the build problem. Thanks. > It still > fails later one, but I don't care about that FYI I have this patch installed in my local sources that allows the iq2000 port to build successfully. I have not submitted it upstream yet because I am not sure if it is the correct fix for the problem. Cheers Nick Index: gcc/dwarf2out.c =================================================================== --- gcc/dwarf2out.c (revision 192527) +++ gcc/dwarf2out.c (working copy) @@ -20092,11 +20092,13 @@ ca_loc->call_arg_loc_note = loc_note; ca_loc->next = NULL; ca_loc->label = last_label; - gcc_assert (prev - && (CALL_P (prev) - || (NONJUMP_INSN_P (prev) - && GET_CODE (PATTERN (prev)) == SEQUENCE - && CALL_P (XVECEXP (PATTERN (prev), 0, 0))))); + while (prev != NULL_RTX + && ! CALL_P (prev) + && ! (NONJUMP_INSN_P (prev) + && GET_CODE (PATTERN (prev)) == SEQUENCE + && CALL_P (XVECEXP (PATTERN (prev), 0, 0)))) + prev = prev_nonnote_nondebug_insn (prev); + gcc_assert (prev != NULL_RTX); if (!CALL_P (prev)) prev = XVECEXP (PATTERN (prev), 0, 0); ca_loc->tail_call_p = SIBLING_CALL_P (prev);