From patchwork Sun Oct 10 13:17:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 67352 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 9ED90B70A7 for ; Mon, 11 Oct 2010 00:25:36 +1100 (EST) Received: (qmail 19370 invoked by alias); 10 Oct 2010 13:25:33 -0000 Received: (qmail 19355 invoked by uid 22791); 10 Oct 2010 13:25:32 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,TW_GD X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (212.99.106.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 10 Oct 2010 13:25:25 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 76EEACB01EC for ; Sun, 10 Oct 2010 15:25:23 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QhHOQ2W5F6Dn for ; Sun, 10 Oct 2010 15:25:23 +0200 (CEST) Received: from [192.168.1.2] (bon31-9-83-155-120-49.fbx.proxad.net [83.155.120.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 496FFCB0240 for ; Sun, 10 Oct 2010 15:25:23 +0200 (CEST) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Remove support for obsolete switch Date: Sun, 10 Oct 2010 15:17:50 +0200 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Message-Id: <201010101517.50366.ebotcazou@adacore.com> 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 This removes the support for the gdwarf+ switch, which was intended to enable some GNAT-specific extensions to DWARF. They are now obsolete except for the AT_descriptive_type extension awaiting review at: http://gcc.gnu.org/ml/gcc-patches/2010-09/msg00148.html Tested on i586-suse-linux, applied on the mainline. 2010-10-10 Olivier Hainque Eric Botcazou * gcc-interface/lang.opt (gdwarf+): Remove. * gcc-interface/gigi.h (get_parallel_type): Likewise * gcc-interface/misc.c (gnat_dwarf_extensions): Likewise. (gnat_handle_option): Remove OPT_gdwarfplus case. (gnat_post_options): Remove setting of use_gnu_debug_info_extensions from gnat_dwarf_extensions. * gcc-interface/trans.c (gigi): Remove -gdwarf+ initializations. * gcc-interface/utils.c (get_parallel_type): Remove. Index: gcc-interface/utils.c =================================================================== --- gcc-interface/utils.c (revision 165250) +++ gcc-interface/utils.c (working copy) @@ -963,17 +963,6 @@ add_parallel_type (tree decl, tree paral SET_DECL_PARALLEL_TYPE (d, parallel_type); } -/* Return the parallel type associated to a type, if any. */ - -tree -get_parallel_type (tree type) -{ - if (TYPE_STUB_DECL (type)) - return DECL_PARALLEL_TYPE (TYPE_STUB_DECL (type)); - else - return NULL_TREE; -} - /* Utility function of above to merge LAST_SIZE, the previous size of a record with FIRST_BIT and SIZE that describe a field. SPECIAL is true if this represents a QUAL_UNION_TYPE in which case we must look for COND_EXPRs and Index: gcc-interface/lang.opt =================================================================== --- gcc-interface/lang.opt (revision 165234) +++ gcc-interface/lang.opt (working copy) @@ -101,10 +101,6 @@ fRTS= Ada Joined RejectNegative ; Selects the runtime -gdwarf+ -Ada -; Explicit request for dwarf debug info with GNAT specific extensions. - gant Ada Joined Undocumented ; Catches typos Index: gcc-interface/gigi.h =================================================================== --- gcc-interface/gigi.h (revision 165250) +++ gcc-interface/gigi.h (working copy) @@ -509,9 +509,6 @@ extern void rest_of_record_type_compilat /* Append PARALLEL_TYPE on the chain of parallel types for decl. */ extern void add_parallel_type (tree decl, tree parallel_type); -/* Return the parallel type associated to a type, if any. */ -extern tree get_parallel_type (tree type); - /* Return a FUNCTION_TYPE node. RETURN_TYPE is the type returned by the subprogram. If it is VOID_TYPE, then we are dealing with a procedure, otherwise we are dealing with a function. PARAM_DECL_LIST is a list of Index: gcc-interface/trans.c =================================================================== --- gcc-interface/trans.c (revision 165253) +++ gcc-interface/trans.c (working copy) @@ -286,18 +286,6 @@ gigi (Node_Id gnat_root, int max_gnat_no TYPE_SIZE_UNIT (void_type_node) = size_zero_node; } - /* If the GNU type extensions to DWARF are available, setup the hooks. */ -#if defined (DWARF2_DEBUGGING_INFO) && defined (DWARF2_GNU_TYPE_EXTENSIONS) - /* We condition the name demangling and the generation of type encoding - strings on -gdwarf+ and always set descriptive types on. */ - if (use_gnu_debug_info_extensions) - { - dwarf2out_set_type_encoding_func (extract_encoding); - dwarf2out_set_demangle_name_func (decode_name); - } - dwarf2out_set_descriptive_type_func (get_parallel_type); -#endif - /* Enable GNAT stack checking method if needed */ if (!Stack_Check_Probes_On_Target) set_stack_check_libfunc ("_gnat_stack_check"); Index: gcc-interface/misc.c =================================================================== --- gcc-interface/misc.c (revision 165250) +++ gcc-interface/misc.c (working copy) @@ -59,12 +59,6 @@ /* This symbol needs to be defined for the front-end. */ void *callgraph_info_file = NULL; -/* How much we want of our DWARF extensions. Some of our DWARF extensions - are incompatible with regular GDB versions, so we must make sure to only - produce them on explicit request. This is eventually reflected into the - use_gnu_debug_info_extensions common flag for later processing. */ -static int gnat_dwarf_extensions = 0; - /* Command-line argc and argv. These variables are global since they are imported in back_end.adb. */ unsigned int save_argc; @@ -139,10 +133,6 @@ gnat_handle_option (size_t scode, const flag_eliminate_unused_debug_types = -value; break; - case OPT_gdwarfplus: - gnat_dwarf_extensions = 1; - break; - case OPT_gant: warning (0, "%<-gnat%> misspelled as %<-gant%>"); @@ -260,11 +250,6 @@ gnat_post_options (const char **pfilenam else flag_eliminate_unused_debug_types = 0; - /* Reflect the explicit request of DWARF extensions into the common - flag for use by later passes. */ - if (write_symbols == DWARF2_DEBUG) - use_gnu_debug_info_extensions = gnat_dwarf_extensions > 0; - optimize = global_options.x_optimize; optimize_size = global_options.x_optimize_size;