From patchwork Thu Mar 24 15:30:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 88215 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 8870F1007DB for ; Fri, 25 Mar 2011 02:30:51 +1100 (EST) Received: (qmail 1253 invoked by alias); 24 Mar 2011 15:30:48 -0000 Received: (qmail 968 invoked by uid 22791); 24 Mar 2011 15:30:47 -0000 X-SWARE-Spam-Status: No, hits=-6.3 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; Thu, 24 Mar 2011 15:30:43 +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 p2OFUgu0010854 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Mar 2011 11:30:43 -0400 Received: from [10.3.113.61] (ovpn-113-61.phx2.redhat.com [10.3.113.61]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2OFUfmi006123 for ; Thu, 24 Mar 2011 11:30:42 -0400 Subject: [debug] Remove deprecated DW_FORM_sig8 define From: Mark Wielaard To: gcc-patches@gcc.gnu.org Date: Thu, 24 Mar 2011 16:30:41 +0100 Message-ID: <1300980641.4889.58.camel@springer.wildebeest.org> Mime-Version: 1.0 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, While reading through the unit type support I noticed some parts were still using the old DW_FORM_sig8 while others used the actual DW_FORM_ref_sig8 as used in the dwarf spec. I missed some things in a first scan because of this, so I thought I just clean it up. 2010-03-24 Mark Wielaard * dwarf2.h (dwarf_form): Remove deprecated DW_FORM_sig8 define. 2011-03-24 Mark Wielaard * dwarf2out.c (size_of_die): Modify comment to say DW_FORM_ref_sig8. (value_format): Use DW_FORM_ref_sig8, not DW_FORM_sig8. binutils already only uses the new definition. I have a similar cleanup patch for gdb. OK, to commit? Thanks, Mark diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9dec3e4..41d55bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-03-24 Mark Wielaard + + * dwarf2out.c (size_of_die): Modify comment to say DW_FORM_ref_sig8. + (value_format): Use DW_FORM_ref_sig8, not DW_FORM_sig8. + 2011-03-24 Richard Guenther PR tree-optimization/46562 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index aa6f6b6..bc05982 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -10729,7 +10729,7 @@ size_of_die (dw_die_ref die) case dw_val_class_die_ref: if (AT_ref_external (a)) { - /* In DWARF4, we use DW_FORM_sig8; for earlier versions + /* In DWARF4, we use DW_FORM_ref_sig8; for earlier versions we use DW_FORM_ref_addr. In DWARF2, DW_FORM_ref_addr is sized by target address length, whereas in DWARF3 it's always sized as an offset. */ @@ -11005,7 +11005,7 @@ value_format (dw_attr_ref a) return DW_FORM_flag; case dw_val_class_die_ref: if (AT_ref_external (a)) - return dwarf_version >= 4 ? DW_FORM_sig8 : DW_FORM_ref_addr; + return dwarf_version >= 4 ? DW_FORM_ref_sig8 : DW_FORM_ref_addr; else return DW_FORM_ref; case dw_val_class_fde_ref: diff --git a/include/ChangeLog b/include/ChangeLog index a0585b0..4a09ab6 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2010-03-24 Mark Wielaard + + * dwarf2.h (dwarf_form): Remove deprecated DW_FORM_sig8 define. + 2010-03-23 Rafael Ávila de Espíndola * plugin-api.h (ld_plugin_get_view): New. diff --git a/include/dwarf2.h b/include/dwarf2.h index 46f2291..ef0fa5f 100644 --- a/include/dwarf2.h +++ b/include/dwarf2.h @@ -189,7 +189,6 @@ enum dwarf_form DW_FORM_exprloc = 0x18, DW_FORM_flag_present = 0x19, DW_FORM_ref_sig8 = 0x20 -#define DW_FORM_sig8 DW_FORM_ref_sig8 /* Note: The use of DW_FORM_sig8 is deprecated. */ }; /* Attribute names and codes. */