diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2014-04-23 10:29:47 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-04-23 10:29:47 +0000 |
| commit | 8f78ecdbe08233a96bad6d268a6bd06c754949b0 (patch) | |
| tree | 5e4ae646ce6b47a1c937834a7d57b54af38e57e4 /gcc/ada/gcc-interface/misc.c | |
| parent | eab264af0c65e7830f140d12008527244a7236a8 (diff) | |
| download | gcc-8f78ecdbe08233a96bad6d268a6bd06c754949b0.zip gcc-8f78ecdbe08233a96bad6d268a6bd06c754949b0.tar.gz gcc-8f78ecdbe08233a96bad6d268a6bd06c754949b0.tar.bz2 | |
Revert
2014-04-22 Richard Henderson <rth@redhat.com>
* gcc-interface/Makefile.in: Support aarch64-linux.
2014-04-22 Eric Botcazou <ebotcazou@adacore.com>
* fe.h (Compiler_Abort): Replace Fat_Pointer with String_Pointer.
(Error_Msg_N): Likewise.
(Error_Msg_NE): Likewise.
(Get_External_Name_With_Suffix): Likewise.
* types.h (Fat_Pointer): Delete.
(String_Pointer): New type.
(DECLARE_STRING_POINTER): New macro.
* gcc-interface/decl.c (create_concat_name): Adjust.
* gcc-interface/trans.c (post_error): Likewise.
(post_error_ne): Likewise.
* gcc-interface/misc.c (internal_error_function): Likewise.
From-SVN: r209684
Diffstat (limited to 'gcc/ada/gcc-interface/misc.c')
| -rw-r--r-- | gcc/ada/gcc-interface/misc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 33db181..a5f2881 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -283,8 +283,8 @@ internal_error_function (diagnostic_context *context, text_info tinfo; char *buffer, *p, *loc; String_Template temp, temp_loc; - DECLARE_STRING_POINTER (sp, sp_loc); - expanded_location xloc; + Fat_Pointer fp, fp_loc; + expanded_location s; /* Warn if plugins present. */ warn_if_plugins (); @@ -311,21 +311,21 @@ internal_error_function (diagnostic_context *context, temp.Low_Bound = 1; temp.High_Bound = p - buffer; - sp.Bounds = &temp; - sp.Array = buffer; + fp.Bounds = &temp; + fp.Array = buffer; - xloc = expand_location (input_location); - if (context->show_column && xloc.column != 0) - asprintf (&loc, "%s:%d:%d", xloc.file, xloc.line, xloc.column); + s = expand_location (input_location); + if (context->show_column && s.column != 0) + asprintf (&loc, "%s:%d:%d", s.file, s.line, s.column); else - asprintf (&loc, "%s:%d", xloc.file, xloc.line); + asprintf (&loc, "%s:%d", s.file, s.line); temp_loc.Low_Bound = 1; temp_loc.High_Bound = strlen (loc); - sp_loc.Bounds = &temp_loc; - sp_loc.Array = loc; + fp_loc.Bounds = &temp_loc; + fp_loc.Array = loc; Current_Error_Node = error_gnat_node; - Compiler_Abort (sp, -1, sp_loc); + Compiler_Abort (fp, -1, fp_loc); } /* Perform all the initialization steps that are language-specific. */ |