diff options
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/misc.c | 2 | ||||
| -rw-r--r-- | gcc/ada/trans.c | 19 |
3 files changed, 7 insertions, 21 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 954f1a9..148d066 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2008-02-26 Tom Tromey <tromey@redhat.com> + + * misc.c (internal_error_function): Remove test of + USE_MAPPED_LOCATION. + * trans.c (gigi): Remove test of USE_MAPPED_LOCATION. + (Sloc_to_locus): Remove old location code. + 2008-02-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * gnat_rm.texi, gnat_ugn.texi: Fix spacing after `e.g.' and diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c index c54bd9f..4ddf10f2 100644 --- a/gcc/ada/misc.c +++ b/gcc/ada/misc.c @@ -412,11 +412,9 @@ internal_error_function (const char *msgid, va_list *ap) fp.Array = buffer; s = expand_location (input_location); -#ifdef USE_MAPPED_LOCATION if (flag_show_column && s.column != 0) asprintf (&loc, "%s:%d:%d", s.file, s.line, s.column); else -#endif asprintf (&loc, "%s:%d", s.file, s.line); temp_loc.Low_Bound = 1; temp_loc.High_Bound = strlen (loc); diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c index d1b454c..34cb297 100644 --- a/gcc/ada/trans.c +++ b/gcc/ada/trans.c @@ -244,7 +244,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name, type_annotate_only = (gigi_operating_mode == 1); -#ifdef USE_MAPPED_LOCATION for (i = 0; i < number_files; i++) { /* Use the identifier table to make a permanent copy of the filename as @@ -268,7 +267,6 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name, linemap_position_for_column (line_table, 252 - 1); linemap_add (line_table, LC_LEAVE, 0, NULL, 0); } -#endif /* Initialize ourselves. */ init_code_table (); @@ -6650,7 +6648,6 @@ Sloc_to_locus (Source_Ptr Sloc, location_t *locus) return false; if (Sloc <= Standard_Location) -#ifdef USE_MAPPED_LOCATION { *locus = BUILTINS_LOCATION; return false; @@ -6667,22 +6664,6 @@ Sloc_to_locus (Source_Ptr Sloc, location_t *locus) + ((line - map->to_line) << map->column_bits) + (column & ((1 << map->column_bits) - 1)); } -#else - return false; - - /* Use the identifier table to make a hashed, permanent copy of the filename, - since the name table gets reallocated after Gigi returns but before all - the debugging information is output. The __gnat_to_canonical_file_spec - call translates filenames from pragmas Source_Reference that contain host - style syntax not understood by gdb. */ - locus->file - = IDENTIFIER_POINTER - (get_identifier - (__gnat_to_canonical_file_spec - (Get_Name_String (Full_Debug_Name (Get_Source_File_Index (Sloc)))))); - - locus->line = Get_Logical_Line_Number (Sloc); -#endif ref_filename = IDENTIFIER_POINTER |