From b1607943813559574658ede69b4f20d7e7bd9b66 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Sun, 10 Oct 2010 13:25:19 +0000 Subject: [PATCH] lang.opt (gdwarf+): Remove. * 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. From-SVN: r165254 --- gcc/ada/ChangeLog | 14 +++++++++++++- gcc/ada/gcc-interface/gigi.h | 3 --- gcc/ada/gcc-interface/lang.opt | 4 ---- gcc/ada/gcc-interface/misc.c | 15 --------------- gcc/ada/gcc-interface/trans.c | 12 ------------ gcc/ada/gcc-interface/utils.c | 11 ----------- 6 files changed, 13 insertions(+), 46 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0b1f358..376a8af 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,8 +1,20 @@ +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. + 2010-10-10 Eric Botcazou * gcc-interface/trans.c (gnat_to_gnu) : Use invert_truthvalue_loc instead of invert_truthvalue. - * utils2.c (build_binary_op) : Likewise. + * gcc-interface/utils2.c (build_binary_op) : Likewise. (build_unary_op) : Likewise. 2010-10-10 Eric Botcazou diff --git a/gcc/ada/gcc-interface/gigi.h b/gcc/ada/gcc-interface/gigi.h index 2fa2a07..d529e78 100644 --- a/gcc/ada/gcc-interface/gigi.h +++ b/gcc/ada/gcc-interface/gigi.h @@ -509,9 +509,6 @@ extern void rest_of_record_type_compilation (tree record_type); /* 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 diff --git a/gcc/ada/gcc-interface/lang.opt b/gcc/ada/gcc-interface/lang.opt index 3b9129b..d4fae4a 100644 --- a/gcc/ada/gcc-interface/lang.opt +++ b/gcc/ada/gcc-interface/lang.opt @@ -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 diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 0dd29a6..7703e2e 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -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 char *arg ATTRIBUTE_UNUSED, int value, 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 **pfilename ATTRIBUTE_UNUSED) 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; diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index b644688..8dbd3a1 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -286,18 +286,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED, 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"); diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 6ee95b7..876556c 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -963,17 +963,6 @@ add_parallel_type (tree decl, tree parallel_type) 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 -- 2.7.4