From patchwork Fri Sep 10 10:56:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 64376 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 AA6A1B711F for ; Fri, 10 Sep 2010 20:55:45 +1000 (EST) Received: (qmail 11377 invoked by alias); 10 Sep 2010 10:55:43 -0000 Received: (qmail 11362 invoked by uid 22791); 10 Sep 2010 10:55:42 -0000 X-SWARE-Spam-Status: No, hits=-6.2 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; Fri, 10 Sep 2010 10:55:37 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8AAtZTR013097 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Sep 2010 06:55:35 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8AAtY2K022805 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 10 Sep 2010 06:55:35 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id o8AAu8kE023593 for ; Fri, 10 Sep 2010 12:56:08 +0200 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id o8AAu8Pc023592 for gcc-patches@gcc.gnu.org; Fri, 10 Sep 2010 12:56:08 +0200 Date: Fri, 10 Sep 2010 12:56:08 +0200 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [committed[ Fix darwin bootstrap Message-ID: <20100910105608.GU1269@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) 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! I've wrongly thought that die_offset is HWI, when it is dw_offset aka long int. On both arches I've been bootstrapping this (x86_64 and i686) HWI is long int and thus there were no warnings. The other change is to disable DW_OP_GNU_implicit_pointer generation for targets with old tools that can't grok newer extensions. If DW_OP_implicit_pointer is accepted for DWARF5, then dwarf_version < 5 && would be added to the condition. Committed to trunk as obvious. 2010-09-10 Jakub Jelinek PR bootstrap/45630 * dwarf2out.c (get_ref_die_offset_label): Use %ld instead of HOST_WIDE_INT_PRINT_DEC to print ref->die_offset. (implicit_ptr_descriptor): Return NULL if dwarf_strict. Jakub --- gcc/dwarf2out.c.jj 2010-09-09 08:42:55.000000000 +0200 +++ gcc/dwarf2out.c 2010-09-10 12:20:49.816646667 +0200 @@ -6545,8 +6545,7 @@ is_tagged_type (const_tree type) static void get_ref_die_offset_label (char *label, dw_die_ref ref) { - sprintf (label, "%s+" HOST_WIDE_INT_PRINT_DEC, - debug_info_section_label, ref->die_offset); + sprintf (label, "%s+%ld", debug_info_section_label, ref->die_offset); } /* Convert a DIE tag into its string name. */ @@ -14285,6 +14284,8 @@ implicit_ptr_descriptor (rtx rtl, HOST_W dw_loc_descr_ref ret; dw_die_ref ref; + if (dwarf_strict) + return NULL; gcc_assert (TREE_CODE (DEBUG_IMPLICIT_PTR_DECL (rtl)) == VAR_DECL || TREE_CODE (DEBUG_IMPLICIT_PTR_DECL (rtl)) == PARM_DECL || TREE_CODE (DEBUG_IMPLICIT_PTR_DECL (rtl)) == RESULT_DECL);