From 569128117ccf37ff83033a69929d5c76f1d8acb3 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 12 Nov 2013 13:43:44 +0400 Subject: [PATCH] Replace "info-ada-exceptions" by "ada-exceptions" in -list-features Rather than having -list-features report support for the GDB/MI commands providing access to Ada exception catchpoints with one entry, and the GDB/MI command providing the list of Ada exceptions with a second entry, this patch merges it all within one single entry. This is OK, because all these commands were added within a short amount of time, and within the same release cycle; and it reduces a bit the size of the output. gdb/ChangeLog: * mi/mi-main.c (mi_cmd_list_features): Replace "info-ada-exceptions" entry with "ada-exceptions". gdb/doc/ChangeLog: * gdb.texinfo (GDB/MI Miscellaneous Commands): Delete the documentation of "info-ada-exceptions" in the output of the "-list-features" command. Add the documentation of the "ada-exception" entry instead. --- gdb/doc/gdb.texinfo | 6 ++++-- gdb/mi/mi-main.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index de419ea..2c4234a 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -35080,8 +35080,10 @@ Indicates that changes to breakpoints and breakpoints created via the CLI will be announced via async records. @item ada-task-info Indicates support for the @code{-ada-task-info} command. -@item info-ada-exceptions -Indicates support for the @code{-info-ada-exceptions} command. +@item ada-exceptions +Indicates support for the following commands, all related to Ada +exceptions: @code{-info-ada-exceptions}, @code{-catch-assert} and +@code{-catch-exception}. @end table @subheading The @code{-list-target-features} Command diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index bf0fce3..c3f7221 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1815,7 +1815,7 @@ mi_cmd_list_features (char *command, char **argv, int argc) ui_out_field_string (uiout, NULL, "data-read-memory-bytes"); ui_out_field_string (uiout, NULL, "breakpoint-notifications"); ui_out_field_string (uiout, NULL, "ada-task-info"); - ui_out_field_string (uiout, NULL, "info-ada-exceptions"); + ui_out_field_string (uiout, NULL, "ada-exceptions"); #if HAVE_PYTHON if (gdb_python_initialized) -- 1.8.1.2