* [PATCH 0/4] Remove gdbcmd.h
@ 2024-04-23 19:22 Simon Marchi
2024-04-23 19:22 ` [PATCH 1/4] gdb: move execute function declarations from gdbcmd.h to top.h Simon Marchi
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-23 19:22 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
gdbcmd.h is a remnant from the past, move all the declarations it holds
in more appropriate headers and remove it.
Simon Marchi (4):
gdb: move execute function declarations from gdbcmd.h to top.h
gdb: remove unused print_command_line and print_command_lines
declarations
gdb: move style_set_list/style_show_list declarations to
cli/cli-style.h
gdb: remove gdbcmd.h
gdb/Makefile.in | 1 -
gdb/aarch64-linux-nat.c | 2 +-
gdb/aarch64-tdep.c | 2 +-
gdb/ada-lang.c | 2 +-
gdb/ada-tasks.c | 2 +-
gdb/agent.c | 2 +-
gdb/aix-thread.c | 2 +-
gdb/alpha-tdep.c | 2 +-
gdb/amd64-tdep.c | 2 +-
gdb/arc-tdep.c | 2 +-
gdb/arch-utils.c | 2 +-
gdb/arm-tdep.c | 2 +-
gdb/auto-load.c | 1 -
gdb/avr-tdep.c | 2 +-
gdb/ax-gdb.c | 2 +-
gdb/blockframe.c | 2 +-
gdb/bpf-tdep.c | 2 +-
gdb/break-catch-sig.c | 2 +-
gdb/break-catch-syscall.c | 2 +-
gdb/break-catch-throw.c | 2 +-
gdb/breakpoint.c | 2 +-
gdb/bt-utils.c | 2 +-
gdb/btrace.c | 2 +-
gdb/charset.c | 2 +-
gdb/cli/cli-cmds.c | 1 -
gdb/cli/cli-logging.c | 2 +-
gdb/cli/cli-script.c | 1 -
gdb/cli/cli-style.h | 4 ++
gdb/coff-pe-read.c | 2 +-
gdb/compile/compile-cplus-symbols.c | 2 +-
gdb/compile/compile-cplus-types.c | 2 +-
gdb/compile/compile-object-load.c | 2 +-
gdb/compile/compile.c | 2 +-
gdb/complaints.c | 3 +-
gdb/completer.c | 2 +-
gdb/copying.awk | 2 +-
gdb/copying.c | 2 +-
gdb/corefile.c | 2 +-
gdb/corelow.c | 2 +-
gdb/cp-abi.c | 2 +-
gdb/cp-support.c | 2 +-
gdb/cp-valprint.c | 2 +-
gdb/cris-tdep.c | 2 +-
gdb/csky-tdep.c | 2 +-
gdb/darwin-nat-info.c | 2 +-
gdb/darwin-nat.c | 2 +-
gdb/dcache.c | 2 +-
gdb/disasm.c | 2 +-
gdb/dummy-frame.c | 2 +-
gdb/dwarf2/index-write.c | 2 +-
gdb/dwarf2/loc.c | 2 +-
gdb/dwarf2/read.c | 2 +-
gdb/event-top.c | 2 +-
gdb/exec.c | 2 +-
gdb/f-lang.c | 2 +-
gdb/fbsd-nat.c | 2 +-
gdb/filesystem.c | 2 +-
gdb/findcmd.c | 2 +-
gdb/fork-child.c | 2 +-
gdb/frame.c | 2 +-
gdb/ft32-tdep.c | 2 +-
gdb/gdb-demangle.c | 2 +-
gdb/gdb_bfd.c | 2 +-
gdb/gdbcmd.h | 72 -----------------------------
gdb/gdbtypes.c | 2 +-
gdb/gnu-nat.c | 2 +-
gdb/go32-nat.c | 2 +-
gdb/guile/guile.c | 1 -
gdb/guile/scm-auto-load.c | 1 -
gdb/guile/scm-breakpoint.c | 2 +-
gdb/guile/scm-cmd.c | 2 +-
gdb/guile/scm-param.c | 2 +-
gdb/hppa-tdep.c | 2 +-
gdb/i386-darwin-nat.c | 2 +-
gdb/i386-tdep.c | 2 +-
gdb/infcall.c | 2 +-
gdb/infcmd.c | 2 +-
gdb/inferior.c | 2 +-
gdb/inflow.c | 2 +-
gdb/interps.c | 2 +-
gdb/jit.c | 2 +-
gdb/language.c | 2 +-
gdb/linux-fork.c | 2 +-
gdb/linux-nat.c | 2 +-
gdb/linux-tdep.c | 2 +-
gdb/linux-thread-db.c | 2 +-
gdb/m32r-tdep.c | 2 +-
gdb/m68hc11-tdep.c | 2 +-
gdb/machoread.c | 2 +-
gdb/macrocmd.c | 2 +-
gdb/maint-test-options.c | 2 +-
gdb/maint-test-settings.c | 2 +-
gdb/maint.c | 1 -
gdb/memattr.c | 2 +-
gdb/mep-tdep.c | 2 +-
gdb/mi/mi-main.c | 2 +-
gdb/microblaze-linux-tdep.c | 2 +-
gdb/microblaze-tdep.c | 2 +-
gdb/mips-linux-nat.c | 2 +-
gdb/mips-tdep.c | 2 +-
gdb/moxie-tdep.c | 2 +-
gdb/nios2-tdep.c | 2 +-
gdb/objc-lang.c | 2 +-
gdb/observable.c | 2 +-
gdb/or1k-tdep.c | 2 +-
gdb/osabi.c | 2 +-
gdb/osdata.c | 2 +-
gdb/p-valprint.c | 2 +-
gdb/parse.c | 2 +-
gdb/ppc-linux-tdep.c | 2 +-
gdb/printcmd.c | 3 +-
gdb/proc-api.c | 2 +-
gdb/procfs.c | 2 +-
gdb/progspace.c | 2 +-
gdb/psymtab.c | 2 +-
gdb/python/py-auto-load.c | 2 +-
gdb/python/py-breakpoint.c | 2 +-
gdb/python/py-cmd.c | 2 +-
gdb/python/py-function.c | 2 +-
gdb/python/py-param.c | 2 +-
gdb/python/py-record-btrace.c | 2 +-
gdb/python/py-unwind.c | 2 +-
gdb/python/python.c | 2 +-
gdb/ravenscar-thread.c | 2 +-
gdb/record-btrace.c | 3 +-
gdb/record-full.c | 3 +-
gdb/record.c | 3 +-
gdb/regcache-dump.c | 2 +-
gdb/regcache.c | 1 -
gdb/reggroups.c | 2 +-
gdb/remote-fileio.c | 2 +-
gdb/remote-notif.c | 2 +-
gdb/remote.c | 2 +-
gdb/riscv-tdep.c | 2 +-
gdb/rs6000-tdep.c | 2 +-
gdb/s12z-tdep.c | 2 +-
gdb/s390-linux-nat.c | 2 +-
gdb/ser-go32.c | 2 +-
gdb/ser-tcp.c | 2 +-
gdb/ser-unix.c | 2 +-
gdb/serial.c | 2 +-
gdb/sh-tdep.c | 2 +-
gdb/skip.c | 2 +-
gdb/sol-thread.c | 2 +-
gdb/source.c | 2 +-
gdb/sparc64-tdep.c | 2 +-
gdb/stack.c | 3 +-
gdb/stap-probe.c | 2 +-
gdb/symfile-debug.c | 2 +-
gdb/symfile-mem.c | 2 +-
gdb/symfile.c | 2 +-
gdb/symmisc.c | 2 +-
gdb/symtab.c | 1 -
gdb/target-dcache.c | 1 -
gdb/target-descriptions.c | 2 +-
gdb/target.c | 2 +-
gdb/thread.c | 3 +-
gdb/tic6x-tdep.c | 2 +-
gdb/tilegx-tdep.c | 2 +-
gdb/top.c | 14 +++---
gdb/top.h | 24 ++++++++++
gdb/tracepoint.c | 2 +-
gdb/tui/tui-regs.c | 2 +-
gdb/tui/tui-win.c | 1 -
gdb/tui/tui.c | 2 +-
gdb/typeprint.c | 2 +-
gdb/utils.c | 2 +-
gdb/valops.c | 2 +-
gdb/valprint.c | 2 +-
gdb/value.c | 2 +-
gdb/varobj.c | 2 +-
gdb/windows-nat.c | 2 +-
gdb/windows-tdep.c | 2 +-
gdb/x86-nat.c | 2 +-
gdb/xml-support.c | 2 +-
gdb/xstormy16-tdep.c | 2 +-
gdb/xtensa-tdep.c | 2 +-
gdb/z80-tdep.c | 2 +-
178 files changed, 205 insertions(+), 253 deletions(-)
delete mode 100644 gdb/gdbcmd.h
base-commit: 3e562e4be872771fbd3fa2526a97eccb69458add
--
2.44.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] gdb: move execute function declarations from gdbcmd.h to top.h
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
@ 2024-04-23 19:22 ` Simon Marchi
2024-04-23 19:22 ` [PATCH 2/4] gdb: remove unused print_command_line and print_command_lines declarations Simon Marchi
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-23 19:22 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
These functions are implemented in top.c, move their declarations to
top.h.
Change-Id: I8893ef91d955156a6530734fefe8002d78c3e5fc
---
gdb/complaints.c | 1 +
gdb/gdbcmd.h | 31 -------------------------------
gdb/printcmd.c | 1 +
gdb/record-btrace.c | 1 +
gdb/record-full.c | 1 +
gdb/record.c | 1 +
gdb/stack.c | 1 +
gdb/thread.c | 1 +
gdb/top.c | 13 +++++++------
gdb/top.h | 24 ++++++++++++++++++++++++
10 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/gdb/complaints.c b/gdb/complaints.c
index d3c72df6d41f..7dd5205adf83 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -21,6 +21,7 @@
#include "command.h"
#include "gdbcmd.h"
#include "run-on-main-thread.h"
+#include "top.h"
#include "gdbsupport/selftest.h"
#include <unordered_map>
#include <mutex>
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index 8a1f6f200520..c212a0caf736 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -29,37 +29,6 @@
#include "cli/cli-script.h"
#include "cli/cli-cmds.h"
-extern void execute_command (const char *, int);
-
-/* Run FN. Sends its output to FILE, do not display it to the screen.
- The global BATCH_FLAG will be temporarily set to true. */
-
-extern void execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn);
-
-/* Run FN. Capture its output into the returned string, do not display it
- to the screen. The global BATCH_FLAG will temporarily be set to true.
- When TERM_OUT is true the output is collected with terminal behaviour
- (e.g. with styling). When TERM_OUT is false raw output will be collected
- (e.g. no styling). */
-
-extern void execute_fn_to_string (std::string &res,
- std::function<void(void)> fn, bool term_out);
-
-/* As execute_fn_to_ui_file, but run execute_command for P and FROM_TTY. */
-
-extern void execute_command_to_ui_file (struct ui_file *file,
- const char *p, int from_tty);
-
-/* As execute_fn_to_string, but run execute_command for P and FROM_TTY. */
-
-extern void execute_command_to_string (std::string &res, const char *p,
- int from_tty, bool term_out);
-
-/* As execute_command_to_string, but ignore resulting string. */
-
-extern void execute_command_to_string (const char *p,
- int from_tty, bool term_out);
-
extern void print_command_line (struct command_line *, unsigned int,
struct ui_file *);
extern void print_command_lines (struct ui_out *,
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 66669f105c5c..25e391b15d5c 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -22,6 +22,7 @@
#include "frame.h"
#include "symtab.h"
#include "gdbtypes.h"
+#include "top.h"
#include "value.h"
#include "language.h"
#include "c-lang.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 0ef1dfbe652f..aac59ee6a6dc 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -28,6 +28,7 @@
#include "observable.h"
#include "cli/cli-utils.h"
#include "source.h"
+#include "top.h"
#include "ui-out.h"
#include "symtab.h"
#include "filenames.h"
diff --git a/gdb/record-full.c b/gdb/record-full.c
index 9d8c4ee438fd..d288eb957fee 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -39,6 +39,7 @@
#include "gdbsupport/gdb_unlinker.h"
#include "gdbsupport/byte-vector.h"
#include "async-event.h"
+#include "top.h"
#include "valprint.h"
#include "interps.h"
diff --git a/gdb/record.c b/gdb/record.c
index 5b1093dd12ee..2059fb7ea0cf 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -26,6 +26,7 @@
#include "cli/cli-utils.h"
#include "disasm.h"
#include "interps.h"
+#include "top.h"
#include <ctype.h>
diff --git a/gdb/stack.c b/gdb/stack.c
index d1832540d624..fae1fce1c39f 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -19,6 +19,7 @@
#include "event-top.h"
#include "extract-store-integer.h"
+#include "top.h"
#include "value.h"
#include "symtab.h"
#include "gdbtypes.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index 60a1bef8cf0a..43c28be384ff 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -24,6 +24,7 @@
#include "frame.h"
#include "inferior.h"
#include "gdbsupport/environ.h"
+#include "top.h"
#include "value.h"
#include "target.h"
#include "gdbthread.h"
diff --git a/gdb/top.c b/gdb/top.c
index d01a0c206cc9..ee45f48b4fdd 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -598,9 +598,10 @@ execute_command (const char *p, int from_tty)
cleanup_if_error.release ();
}
-/* See gdbcmd.h. */
+/* Run FN. Send its output to FILE, do not display it to the screen.
+ The global BATCH_FLAG will be temporarily set to true. */
-void
+static void
execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn)
{
/* GDB_STDOUT should be better already restored during these
@@ -627,7 +628,7 @@ execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn)
}
}
-/* See gdbcmd.h. */
+/* See top.h. */
void
execute_fn_to_string (std::string &res, std::function<void(void)> fn,
@@ -650,7 +651,7 @@ execute_fn_to_string (std::string &res, std::function<void(void)> fn,
res = str_file.release ();
}
-/* See gdbcmd.h. */
+/* See top.h. */
void
execute_command_to_ui_file (struct ui_file *file,
@@ -659,7 +660,7 @@ execute_command_to_ui_file (struct ui_file *file,
execute_fn_to_ui_file (file, [=]() { execute_command (p, from_tty); });
}
-/* See gdbcmd.h. */
+/* See top.h. */
void
execute_command_to_string (std::string &res, const char *p, int from_tty,
@@ -669,7 +670,7 @@ execute_command_to_string (std::string &res, const char *p, int from_tty,
term_out);
}
-/* See gdbcmd.h. */
+/* See top.h. */
void
execute_command_to_string (const char *p, int from_tty,
diff --git a/gdb/top.h b/gdb/top.h
index 68c637a03d83..dc3f2aaf6141 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -47,6 +47,30 @@ extern void quit_command (const char *, int);
extern void quit_cover (void);
extern void execute_command (const char *, int);
+/* Run FN. Capture its output into the returned string, do not display it
+ to the screen. The global BATCH_FLAG will temporarily be set to true.
+ When TERM_OUT is true the output is collected with terminal behaviour
+ (e.g. with styling). When TERM_OUT is false raw output will be collected
+ (e.g. no styling). */
+
+extern void execute_fn_to_string (std::string &res,
+ std::function<void(void)> fn, bool term_out);
+
+/* As execute_fn_to_ui_file, but run execute_command for P and FROM_TTY. */
+
+extern void execute_command_to_ui_file (struct ui_file *file,
+ const char *p, int from_tty);
+
+/* As execute_fn_to_string, but run execute_command for P and FROM_TTY. */
+
+extern void execute_command_to_string (std::string &res, const char *p,
+ int from_tty, bool term_out);
+
+/* Same as the above, but ignore resulting string. */
+
+extern void execute_command_to_string (const char *p,
+ int from_tty, bool term_out);
+
/* If the interpreter is in sync mode (we're running a user command's
list, running command hooks or similars), and we just ran a
synchronous command that started the target, wait for that command
--
2.44.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/4] gdb: remove unused print_command_line and print_command_lines declarations
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
2024-04-23 19:22 ` [PATCH 1/4] gdb: move execute function declarations from gdbcmd.h to top.h Simon Marchi
@ 2024-04-23 19:22 ` Simon Marchi
2024-04-23 19:22 ` [PATCH 3/4] gdb: move style_set_list/style_show_list declarations to cli/cli-style.h Simon Marchi
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-23 19:22 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
There is no corresponding definition for print_command_line.
There is already a declaration for print_command_lines in
cli/cli-script.h (the implementation is in cli/cli-script.c).
Change-Id: Ic9e67ed04703306d614383ead14e2b2b059b2a8e
---
gdb/gdbcmd.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index c212a0caf736..92fa9a7bf14a 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -29,11 +29,6 @@
#include "cli/cli-script.h"
#include "cli/cli-cmds.h"
-extern void print_command_line (struct command_line *, unsigned int,
- struct ui_file *);
-extern void print_command_lines (struct ui_out *,
- struct command_line *, unsigned int);
-
/* Chains containing all defined "set/show style" subcommands. */
extern struct cmd_list_element *style_set_list;
extern struct cmd_list_element *style_show_list;
--
2.44.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] gdb: move style_set_list/style_show_list declarations to cli/cli-style.h
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
2024-04-23 19:22 ` [PATCH 1/4] gdb: move execute function declarations from gdbcmd.h to top.h Simon Marchi
2024-04-23 19:22 ` [PATCH 2/4] gdb: remove unused print_command_line and print_command_lines declarations Simon Marchi
@ 2024-04-23 19:22 ` Simon Marchi
2024-04-23 19:22 ` [PATCH 4/4] gdb: remove gdbcmd.h Simon Marchi
2024-04-25 13:55 ` [PATCH 0/4] Remove gdbcmd.h Tom Tromey
4 siblings, 0 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-23 19:22 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
They are defined in cli/cli-style.c.
Change-Id: Ic478a3985ff0fd773bd7ba85bb144c6e914d0be6
---
gdb/cli/cli-style.h | 4 ++++
gdb/gdbcmd.h | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h
index 31d40ed65ca4..1663b4ee53c9 100644
--- a/gdb/cli/cli-style.h
+++ b/gdb/cli/cli-style.h
@@ -96,6 +96,10 @@ class cli_style_option
const char *value);
};
+/* Chains containing all defined "set/show style" subcommands. */
+extern struct cmd_list_element *style_set_list;
+extern struct cmd_list_element *style_show_list;
+
/* The file name style. */
extern cli_style_option file_name_style;
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index 92fa9a7bf14a..a2e256665b53 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -29,8 +29,4 @@
#include "cli/cli-script.h"
#include "cli/cli-cmds.h"
-/* Chains containing all defined "set/show style" subcommands. */
-extern struct cmd_list_element *style_set_list;
-extern struct cmd_list_element *style_show_list;
-
#endif /* !defined (GDBCMD_H) */
--
2.44.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/4] gdb: remove gdbcmd.h
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
` (2 preceding siblings ...)
2024-04-23 19:22 ` [PATCH 3/4] gdb: move style_set_list/style_show_list declarations to cli/cli-style.h Simon Marchi
@ 2024-04-23 19:22 ` Simon Marchi
2024-04-25 13:55 ` [PATCH 0/4] Remove gdbcmd.h Tom Tromey
4 siblings, 0 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-23 19:22 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
Most files including gdbcmd.h currently rely on it to access things
actually declared in cli/cli-cmds.h (setlist, showlist, etc). To make
things easy, replace all includes of gdbcmd.h with includes of
cli/cli-cmds.h. This might lead to some unused includes of
cli/cli-cmds.h, but it's harmless, and much faster than going through
the 170 or so files by hand.
Change-Id: I11f884d4d616c12c05f395c98bbc2892950fb00f
---
gdb/Makefile.in | 1 -
gdb/aarch64-linux-nat.c | 2 +-
gdb/aarch64-tdep.c | 2 +-
gdb/ada-lang.c | 2 +-
gdb/ada-tasks.c | 2 +-
gdb/agent.c | 2 +-
gdb/aix-thread.c | 2 +-
gdb/alpha-tdep.c | 2 +-
gdb/amd64-tdep.c | 2 +-
gdb/arc-tdep.c | 2 +-
gdb/arch-utils.c | 2 +-
gdb/arm-tdep.c | 2 +-
gdb/auto-load.c | 1 -
gdb/avr-tdep.c | 2 +-
gdb/ax-gdb.c | 2 +-
gdb/blockframe.c | 2 +-
gdb/bpf-tdep.c | 2 +-
gdb/break-catch-sig.c | 2 +-
gdb/break-catch-syscall.c | 2 +-
gdb/break-catch-throw.c | 2 +-
gdb/breakpoint.c | 2 +-
gdb/bt-utils.c | 2 +-
gdb/btrace.c | 2 +-
gdb/charset.c | 2 +-
gdb/cli/cli-cmds.c | 1 -
gdb/cli/cli-logging.c | 2 +-
gdb/cli/cli-script.c | 1 -
gdb/coff-pe-read.c | 2 +-
gdb/compile/compile-cplus-symbols.c | 2 +-
gdb/compile/compile-cplus-types.c | 2 +-
gdb/compile/compile-object-load.c | 2 +-
gdb/compile/compile.c | 2 +-
gdb/complaints.c | 2 +-
gdb/completer.c | 2 +-
gdb/copying.awk | 2 +-
gdb/copying.c | 2 +-
gdb/corefile.c | 2 +-
gdb/corelow.c | 2 +-
gdb/cp-abi.c | 2 +-
gdb/cp-support.c | 2 +-
gdb/cp-valprint.c | 2 +-
gdb/cris-tdep.c | 2 +-
gdb/csky-tdep.c | 2 +-
gdb/darwin-nat-info.c | 2 +-
gdb/darwin-nat.c | 2 +-
gdb/dcache.c | 2 +-
gdb/disasm.c | 2 +-
gdb/dummy-frame.c | 2 +-
gdb/dwarf2/index-write.c | 2 +-
gdb/dwarf2/loc.c | 2 +-
gdb/dwarf2/read.c | 2 +-
gdb/event-top.c | 2 +-
gdb/exec.c | 2 +-
gdb/f-lang.c | 2 +-
gdb/fbsd-nat.c | 2 +-
gdb/filesystem.c | 2 +-
gdb/findcmd.c | 2 +-
gdb/fork-child.c | 2 +-
gdb/frame.c | 2 +-
gdb/ft32-tdep.c | 2 +-
gdb/gdb-demangle.c | 2 +-
gdb/gdb_bfd.c | 2 +-
gdb/gdbcmd.h | 32 -----------------------------
gdb/gdbtypes.c | 2 +-
gdb/gnu-nat.c | 2 +-
gdb/go32-nat.c | 2 +-
gdb/guile/guile.c | 1 -
gdb/guile/scm-auto-load.c | 1 -
gdb/guile/scm-breakpoint.c | 2 +-
gdb/guile/scm-cmd.c | 2 +-
gdb/guile/scm-param.c | 2 +-
gdb/hppa-tdep.c | 2 +-
gdb/i386-darwin-nat.c | 2 +-
gdb/i386-tdep.c | 2 +-
gdb/infcall.c | 2 +-
gdb/infcmd.c | 2 +-
gdb/inferior.c | 2 +-
gdb/inflow.c | 2 +-
gdb/interps.c | 2 +-
gdb/jit.c | 2 +-
gdb/language.c | 2 +-
gdb/linux-fork.c | 2 +-
gdb/linux-nat.c | 2 +-
gdb/linux-tdep.c | 2 +-
gdb/linux-thread-db.c | 2 +-
gdb/m32r-tdep.c | 2 +-
gdb/m68hc11-tdep.c | 2 +-
gdb/machoread.c | 2 +-
gdb/macrocmd.c | 2 +-
gdb/maint-test-options.c | 2 +-
gdb/maint-test-settings.c | 2 +-
gdb/maint.c | 1 -
gdb/memattr.c | 2 +-
gdb/mep-tdep.c | 2 +-
gdb/mi/mi-main.c | 2 +-
gdb/microblaze-linux-tdep.c | 2 +-
gdb/microblaze-tdep.c | 2 +-
gdb/mips-linux-nat.c | 2 +-
gdb/mips-tdep.c | 2 +-
gdb/moxie-tdep.c | 2 +-
gdb/nios2-tdep.c | 2 +-
gdb/objc-lang.c | 2 +-
gdb/observable.c | 2 +-
gdb/or1k-tdep.c | 2 +-
gdb/osabi.c | 2 +-
gdb/osdata.c | 2 +-
gdb/p-valprint.c | 2 +-
gdb/parse.c | 2 +-
gdb/ppc-linux-tdep.c | 2 +-
gdb/printcmd.c | 2 +-
gdb/proc-api.c | 2 +-
gdb/procfs.c | 2 +-
gdb/progspace.c | 2 +-
gdb/psymtab.c | 2 +-
gdb/python/py-auto-load.c | 2 +-
gdb/python/py-breakpoint.c | 2 +-
gdb/python/py-cmd.c | 2 +-
gdb/python/py-function.c | 2 +-
gdb/python/py-param.c | 2 +-
gdb/python/py-record-btrace.c | 2 +-
gdb/python/py-unwind.c | 2 +-
gdb/python/python.c | 2 +-
gdb/ravenscar-thread.c | 2 +-
gdb/record-btrace.c | 2 +-
gdb/record-full.c | 2 +-
gdb/record.c | 2 +-
gdb/regcache-dump.c | 2 +-
gdb/regcache.c | 1 -
gdb/reggroups.c | 2 +-
gdb/remote-fileio.c | 2 +-
gdb/remote-notif.c | 2 +-
gdb/remote.c | 2 +-
gdb/riscv-tdep.c | 2 +-
gdb/rs6000-tdep.c | 2 +-
gdb/s12z-tdep.c | 2 +-
gdb/s390-linux-nat.c | 2 +-
gdb/ser-go32.c | 2 +-
gdb/ser-tcp.c | 2 +-
gdb/ser-unix.c | 2 +-
gdb/serial.c | 2 +-
gdb/sh-tdep.c | 2 +-
gdb/skip.c | 2 +-
gdb/sol-thread.c | 2 +-
gdb/source.c | 2 +-
gdb/sparc64-tdep.c | 2 +-
gdb/stack.c | 2 +-
gdb/stap-probe.c | 2 +-
gdb/symfile-debug.c | 2 +-
gdb/symfile-mem.c | 2 +-
gdb/symfile.c | 2 +-
gdb/symmisc.c | 2 +-
gdb/symtab.c | 1 -
gdb/target-dcache.c | 1 -
gdb/target-descriptions.c | 2 +-
gdb/target.c | 2 +-
gdb/thread.c | 2 +-
gdb/tic6x-tdep.c | 2 +-
gdb/tilegx-tdep.c | 2 +-
gdb/top.c | 1 -
gdb/tracepoint.c | 2 +-
gdb/tui/tui-regs.c | 2 +-
gdb/tui/tui-win.c | 1 -
gdb/tui/tui.c | 2 +-
gdb/typeprint.c | 2 +-
gdb/utils.c | 2 +-
gdb/valops.c | 2 +-
gdb/valprint.c | 2 +-
gdb/value.c | 2 +-
gdb/varobj.c | 2 +-
gdb/windows-nat.c | 2 +-
gdb/windows-tdep.c | 2 +-
gdb/x86-nat.c | 2 +-
gdb/xml-support.c | 2 +-
gdb/xstormy16-tdep.c | 2 +-
gdb/xtensa-tdep.c | 2 +-
gdb/z80-tdep.c | 2 +-
176 files changed, 163 insertions(+), 207 deletions(-)
delete mode 100644 gdb/gdbcmd.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 618c5bbb3399..cb19de69372d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1384,7 +1384,6 @@ HFILES_NO_SRCDIR = \
gdb_vfork.h \
gdb_wchar.h \
gdbarch.h \
- gdbcmd.h \
gdbcore.h \
gdbthread.h \
gdbtypes.h \
diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 297f56cdbf1e..4b2a0ba9f7be 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -25,7 +25,7 @@
#include "linux-nat.h"
#include "target-descriptions.h"
#include "auxv.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "aarch64-nat.h"
#include "aarch64-tdep.h"
#include "aarch64-linux-tdep.h"
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index a01ae39d25cf..8d0553f3d7cd 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -22,7 +22,7 @@
#include "extract-store-integer.h"
#include "frame.h"
#include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "dis-asm.h"
#include "regcache.h"
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index e33a746da9e8..0b430428fb47 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -25,7 +25,7 @@
#include "frame.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "expression.h"
#include "parser-defs.h"
#include "language.h"
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 547395d36d60..83059d720709 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -17,7 +17,7 @@
#include "extract-store-integer.h"
#include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "ada-lang.h"
#include "gdbcore.h"
diff --git a/gdb/agent.c b/gdb/agent.c
index 00e75458a79e..7a2a8e56d284 100644
--- a/gdb/agent.c
+++ b/gdb/agent.c
@@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "gdbsupport/agent.h"
#include "observable.h"
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 0fe87b2b0809..a14173b373db 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -43,7 +43,7 @@
#include "target.h"
#include "inferior.h"
#include "regcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "ppc-tdep.h"
#include "observable.h"
#include "objfiles.h"
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index ada8afd37258..fa042b252b03 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -25,7 +25,7 @@
#include "inferior.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "dis-asm.h"
#include "symfile.h"
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 053067e2cf23..df6b882a3fba 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -30,7 +30,7 @@
#include "frame-unwind.h"
#include "inferior.h"
#include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "objfiles.h"
#include "regcache.h"
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index f35f4c4be74a..9491107ecffb 100644
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -29,7 +29,7 @@
#include "gdbcore.h"
#include "inferior.h"
#include "reggroups.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "osabi.h"
#include "prologue-value.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index b8a18a58af2a..78145656b8d8 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -20,7 +20,7 @@
#include "arch-utils.h"
#include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "infrun.h"
#include "regcache.h"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 97728d9100c7..f36ce631a08d 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -25,7 +25,7 @@
#include "language.h"
#include "inferior.h"
#include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "dis-asm.h"
#include "disasm.h"
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index db6d6ae0f73d..afc98eb1f588 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -27,7 +27,6 @@
#include "observable.h"
#include "objfiles.h"
#include "cli/cli-script.h"
-#include "gdbcmd.h"
#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "cli/cli-setshow.h"
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 68b2646d202d..1e39f851bac4 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -27,7 +27,7 @@
#include "frame-unwind.h"
#include "frame-base.h"
#include "trad-frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "gdbtypes.h"
#include "inferior.h"
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index ae0992a298a3..ab5e80029e2c 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -24,7 +24,7 @@
#include "value.h"
#include "expression.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "frame.h"
#include "target.h"
#include "ax.h"
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index b7c751300cbf..55e82fb4b193 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -30,7 +30,7 @@
#include "regcache.h"
#include "dummy-frame.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "block.h"
#include "inline-frame.h"
diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index 098a08aa7e7c..79a442068b58 100644
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -24,7 +24,7 @@
#include "trad-frame.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "breakpoint.h"
#include "inferior.h"
#include "regcache.h"
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index f077fa29a0c1..72a5ebcdddb4 100644
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -20,7 +20,7 @@
#include "arch-utils.h"
#include <ctype.h>
#include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "infrun.h"
#include "annotate.h"
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index a0e6e6788fe8..52ae60b65fb5 100644
--- a/gdb/break-catch-syscall.c
+++ b/gdb/break-catch-syscall.c
@@ -19,7 +19,7 @@
#include <ctype.h>
#include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "cli/cli-utils.h"
#include "annotate.h"
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index ce614ac8fe37..9a35ede1df67 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -20,7 +20,7 @@
#include "arch-utils.h"
#include <ctype.h>
#include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "annotate.h"
#include "valprint.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 03e073d78792..b321baeb3beb 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -28,7 +28,7 @@
#include "gdbtypes.h"
#include "expression.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "value.h"
#include "command.h"
#include "inferior.h"
diff --git a/gdb/bt-utils.c b/gdb/bt-utils.c
index cbca4a9b7b8e..f658ce0d4bcd 100644
--- a/gdb/bt-utils.c
+++ b/gdb/bt-utils.c
@@ -17,7 +17,7 @@
#include "bt-utils.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "ui.h"
#include "cli/cli-decode.h"
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 04ae3fd0b5eb..66f20ee3fada 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -30,7 +30,7 @@
#include "filenames.h"
#include "regcache.h"
#include "gdbsupport/rsp-low.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-utils.h"
#include "gdbarch.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 4c1debef6143..2ad83d7241be 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbsupport/gdb_obstack.h"
#include "gdbsupport/gdb_wait.h"
#include "charset-list.h"
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 3afe2178199e..476138a97470 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -22,7 +22,6 @@
#include "completer.h"
#include "target.h"
#include "gdbsupport/gdb_wait.h"
-#include "gdbcmd.h"
#include "gdbsupport/gdb_regex.h"
#include "gdb_vfork.h"
#include "linespec.h"
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 2b3572885855..2c54ceafb3eb 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "ui-out.h"
#include "interps.h"
#include "cli/cli-style.h"
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 03e0a2e43e3c..329f780f9160 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -30,7 +30,6 @@
#include "cli/cli-decode.h"
#include "cli/cli-script.h"
#include "cli/cli-style.h"
-#include "gdbcmd.h"
#include "extension.h"
#include "interps.h"
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 43700d96ec36..0da4f12f04f6 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -28,7 +28,7 @@
#include "gdbtypes.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symtab.h"
#include "symfile.h"
#include "objfiles.h"
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index c95c86f37756..9b95cddbf248 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -31,7 +31,7 @@
#include "gdbtypes.h"
#include "dwarf2/loc.h"
#include "cp-support.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "compile-c.h"
#include "inferior.h"
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 212db680482b..8d14114372a4 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -29,7 +29,7 @@
#include "cp-abi.h"
#include "objfiles.h"
#include "block.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "c-lang.h"
#include "compile-c.h"
#include <algorithm>
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
index d1b5d5947a67..08e30be9d31e 100644
--- a/gdb/compile/compile-object-load.c
+++ b/gdb/compile/compile-object-load.c
@@ -24,7 +24,7 @@
#include "gdbcore.h"
#include "readline/tilde.h"
#include "bfdlink.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "inferior.h"
#include "gdbthread.h"
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 2d97a1b2005f..88531a217814 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -24,7 +24,7 @@
#include "cli/cli-utils.h"
#include "cli/cli-option.h"
#include "completer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "compile.h"
#include "compile-internal.h"
#include "compile-object-load.h"
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 7dd5205adf83..debafde794b8 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -19,7 +19,7 @@
#include "complaints.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "run-on-main-thread.h"
#include "top.h"
#include "gdbsupport/selftest.h"
diff --git a/gdb/completer.c b/gdb/completer.c
index 171d1ca8c0ed..f1f44109bdce 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -34,7 +34,7 @@
/* FIXME: This is needed because of lookup_cmd_1 (). We should be
calling a hook instead so we eliminate the CLI dependency. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
/* Needed for rl_completer_word_break_characters and for
rl_filename_completion_function. */
diff --git a/gdb/copying.awk b/gdb/copying.awk
index 0babd8342693..7a450d46c80c 100644
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -7,7 +7,7 @@ BEGIN {
print " Modify copying.awk instead. <== */";
print ""
print "#include \"command.h\""
- print "#include \"gdbcmd.h\""
+ print "#include \"cli/cli-cmds.h\""
print ""
print "static void show_copying_command (const char *, int);"
print ""
diff --git a/gdb/copying.c b/gdb/copying.c
index bc45fe0dc3a5..af465e599d12 100644
--- a/gdb/copying.c
+++ b/gdb/copying.c
@@ -3,7 +3,7 @@
Modify copying.awk instead. <== */
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
static void show_copying_command (const char *, int);
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 8caf3bff383f..044c084ab6f3 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -24,7 +24,7 @@
#include "inferior.h"
#include "symtab.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "bfd.h"
#include "target.h"
#include "gdbcore.h"
diff --git a/gdb/corelow.c b/gdb/corelow.c
index bdda742ef595..a710b07f9684 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -50,7 +50,7 @@
#include "debuginfod-support.h"
#include <unordered_map>
#include <unordered_set>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "xml-tdesc.h"
#include "memtag.h"
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index a813b4ad15cc..3167b745b490 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -21,7 +21,7 @@
#include "value.h"
#include "cp-abi.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "ui-out.h"
static struct cp_abi_ops *find_cp_abi (const char *short_name);
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 5fd53094d053..4f8a6f25d53f 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -21,7 +21,7 @@
#include "cp-support.h"
#include "language.h"
#include "demangle.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "dictionary.h"
#include "objfiles.h"
#include "frame.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index ae28882e1789..2634c1e33a66 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -25,7 +25,7 @@
#include "expression.h"
#include "value.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "demangle.h"
#include "annotate.h"
#include "c-lang.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 8ca9fbc5251a..4c8ae77cc86d 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -30,7 +30,7 @@
#include "inferior.h"
#include "gdbtypes.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "value.h"
#include "opcode/cris.h"
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 49aa1f680122..1b6c08eb730b 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -25,7 +25,7 @@
#include "inferior.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "gdbcore.h"
#include "symfile.h"
diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 3d3e47c998a3..121c3a583883 100644
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -31,7 +31,7 @@
#include "gdbtypes.h"
#include "gdbcore.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "gdbarch.h"
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 33896a88d2b8..c70cd44bb7fb 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -25,7 +25,7 @@
#include "symfile.h"
#include "symtab.h"
#include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "gdbthread.h"
#include "regcache.h"
diff --git a/gdb/dcache.c b/gdb/dcache.c
index ae08f3518c11..2f40d2721c82 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "dcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "target-dcache.h"
#include "inferior.h"
diff --git a/gdb/disasm.c b/gdb/disasm.c
index e54b8521dde3..16736e549977 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -24,7 +24,7 @@
#include "ui-out.h"
#include "disasm.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "dis-asm.h"
#include "source.h"
#include "gdbsupport/gdb-safe-ctype.h"
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 7d72fe032ee1..9f540d02f1ac 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -24,7 +24,7 @@
#include "inferior.h"
#include "frame-unwind.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "observable.h"
#include "gdbthread.h"
#include "infcall.h"
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 3f812285995d..aeb688b13ee5 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -34,7 +34,7 @@
#include "dwarf2/read.h"
#include "dwarf2/dwz.h"
#include "gdb/gdb-index.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "ada-lang.h"
#include "dwarf2/tag.h"
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 23c57bde9391..9db5fc1492d1 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -31,7 +31,7 @@
#include "regcache.h"
#include "objfiles.h"
#include "block.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "complaints.h"
#include "dwarf2.h"
#include "dwarf2/expr.h"
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 501d6c0c992c..7eacafc25b5e 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -62,7 +62,7 @@
#include "cp-support.h"
#include "hashtab.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "block.h"
#include "addrmap.h"
#include "typeprint.h"
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 2fcbad6b937b..0425bcf9f994 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -35,7 +35,7 @@
#include "main.h"
#include "gdbthread.h"
#include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "annotate.h"
#include "maint.h"
#include "ser-event.h"
diff --git a/gdb/exec.c b/gdb/exec.c
index 98ad81fb99ae..3d392b198a1b 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -20,7 +20,7 @@
#include "frame.h"
#include "inferior.h"
#include "target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "filenames.h"
#include "symfile.h"
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 5eeb22806bb6..58f35bf0f3fd 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -35,7 +35,7 @@
#include "c-lang.h"
#include "target-float.h"
#include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "f-array-walker.h"
#include "f-exp.h"
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 2d1bb5a33682..6da32a4a50b2 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -25,7 +25,7 @@
#include "regcache.h"
#include "regset.h"
#include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "gdbsupport/buildargv.h"
#include "gdbsupport/gdb_wait.h"
diff --git a/gdb/filesystem.c b/gdb/filesystem.c
index 4e05b0413a89..564bc1c6c2b0 100644
--- a/gdb/filesystem.c
+++ b/gdb/filesystem.c
@@ -19,7 +19,7 @@
#include "filesystem.h"
#include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
const char file_system_kind_auto[] = "auto";
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 2915c7067334..a802efe00050 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -19,7 +19,7 @@
#include "arch-utils.h"
#include <ctype.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "value.h"
#include "target.h"
#include "cli/cli-utils.h"
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index e0891296f8c9..539b11695d96 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "inferior.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "terminal.h"
#include "gdbthread.h"
#include "ui.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index 0232bdb6865c..43efac07d95a 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -34,7 +34,7 @@
#include "frame-unwind.h"
#include "frame-base.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "observable.h"
#include "objfiles.h"
#include "gdbthread.h"
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 8f7aa51b58a6..647c58441515 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -23,7 +23,7 @@
#include "frame-base.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "inferior.h"
diff --git a/gdb/gdb-demangle.c b/gdb/gdb-demangle.c
index 7779beb591da..ed5aca237014 100644
--- a/gdb/gdb-demangle.c
+++ b/gdb/gdb-demangle.c
@@ -25,7 +25,7 @@
#include "cli/cli-utils.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "demangle.h"
#include "gdb-demangle.h"
#include "language.h"
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 6e97b2168139..6d7b7fa84e5a 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -20,7 +20,7 @@
#include "gdb_bfd.h"
#include "event-top.h"
#include "ui-out.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "hashtab.h"
#include "gdbsupport/filestuff.h"
#ifdef HAVE_MMAP
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
deleted file mode 100644
index a2e256665b53..000000000000
--- a/gdb/gdbcmd.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ***DEPRECATED*** The gdblib files must not be calling/using things in any
- of the possible command languages. If necessary, a hook (that may be
- present or not) must be used and set to the appropriate routine by any
- command language that cares about it. If you are having to include this
- file you are possibly doing things the old way. This file will disappear.
- fnasser@redhat.com */
-
-/* Header file for GDB-specific command-line stuff.
- Copyright (C) 1986-2024 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#if !defined (GDBCMD_H)
-#define GDBCMD_H 1
-
-#include "command.h"
-#include "ui-out.h"
-#include "cli/cli-script.h"
-#include "cli/cli-cmds.h"
-
-#endif /* !defined (GDBCMD_H) */
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 1e1a7e9ce615..5b3c5ac8a026 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -30,7 +30,7 @@
#include "value.h"
#include "demangle.h"
#include "complaints.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cp-abi.h"
#include "hashtab.h"
#include "cp-support.h"
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 92b2858bd9d6..198fc42c2178 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -64,7 +64,7 @@ extern "C"
#include "target.h"
#include "gdbsupport/gdb_wait.h"
#include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "gdbthread.h"
#include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 1d8c16fa71c3..386c73ce26b1 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -91,7 +91,7 @@
#include "gdbsupport/gdb_wait.h"
#include "gdbcore.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "floatformat.h"
#include "buildsym-legacy.h"
#include "i387-tdep.h"
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index f540659d6479..dbbb96edfa85 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -25,7 +25,6 @@
#include "cli/cli-script.h"
#include "cli/cli-utils.h"
#include "command.h"
-#include "gdbcmd.h"
#include "top.h"
#include "ui.h"
#include "extension-priv.h"
diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c
index 90c4eedb9254..57550fa9239c 100644
--- a/gdb/guile/scm-auto-load.c
+++ b/gdb/guile/scm-auto-load.c
@@ -18,7 +18,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "top.h"
-#include "gdbcmd.h"
#include "objfiles.h"
#include "cli/cli-cmds.h"
#include "auto-load.h"
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index a32862b0349f..b8a5d82afa64 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -22,7 +22,7 @@
#include "value.h"
#include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "observable.h"
#include "cli/cli-script.h"
diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index d75d2b63c8ca..2a5507686b0f 100644
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "completer.h"
#include "guile-internal.h"
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c
index 018bd1499c99..3a1e1583f540 100644
--- a/gdb/guile/scm-param.c
+++ b/gdb/guile/scm-param.c
@@ -19,7 +19,7 @@
#include "value.h"
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "completer.h"
#include "language.h"
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index be8ea5798931..c15a9fcc03fa 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -35,7 +35,7 @@
#include "frame-base.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbtypes.h"
#include "objfiles.h"
#include "hppa-tdep.h"
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index acfa46a8b7d0..59655996565c 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -24,7 +24,7 @@
#include "symfile.h"
#include "symtab.h"
#include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "i386-tdep.h"
#include "i387-tdep.h"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 4b1c60ee9246..f1f909e16169 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -28,7 +28,7 @@
#include "frame-unwind.h"
#include "inferior.h"
#include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "gdbtypes.h"
#include "objfiles.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 86f50044d6db..23d5652dd213 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -28,7 +28,7 @@
#include "gdbcore.h"
#include "language.h"
#include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "command.h"
#include "dummy-frame.h"
#include "ada-lang.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 10a964a90d73..0309658690c1 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -25,7 +25,7 @@
#include "infrun.h"
#include "gdbsupport/environ.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symfile.h"
#include "gdbcore.h"
#include "target.h"
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 5621ea40a6d7..0522cb5c14d5 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -22,7 +22,7 @@
#include "target.h"
#include "command.h"
#include "completer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "ui-out.h"
#include "observable.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index ac71e262a1f2..773ac0ba4997 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -28,7 +28,7 @@
#include <fcntl.h>
#include "gdbsupport/gdb_select.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
diff --git a/gdb/interps.c b/gdb/interps.c
index 36d96eea5149..94a982e97ab1 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -29,7 +29,7 @@
the readline command interface, and it is probably simpler to just let
them take over the input in their resume proc. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "ui-out.h"
#include "gdbsupport/event-loop.h"
#include "event-top.h"
diff --git a/gdb/jit.c b/gdb/jit.c
index 92cac0d342a5..797be95a8dac 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -27,7 +27,7 @@
#include "dictionary.h"
#include "filenames.h"
#include "frame-unwind.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "inferior.h"
#include "observable.h"
diff --git a/gdb/language.c b/gdb/language.c
index e43e0fe7a172..be6a1e89fd35 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -32,7 +32,7 @@
#include "symtab.h"
#include "gdbtypes.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "expression.h"
#include "language.h"
#include "varobj.h"
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 867cb187c8af..319a13fd4808 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -22,7 +22,7 @@
#include "inferior.h"
#include "infrun.h"
#include "regcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "infcall.h"
#include "objfiles.h"
#include "linux-fork.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 55cab41bb61b..c357ca3ab8b3 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -32,7 +32,7 @@
#include "nat/linux-personality.h"
#include "linux-fork.h"
#include "gdbthread.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "regset.h"
#include "inf-child.h"
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index b967580a6431..8e6ac87f5a1d 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -34,7 +34,7 @@
#include "observable.h"
#include "objfiles.h"
#include "infcall.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbsupport/gdb_regex.h"
#include "gdbsupport/enum-flags.h"
#include <optional>
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 65bf4a79fdf1..81a9c0d22a7e 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -23,7 +23,7 @@
#include "gdbsupport/gdb_vecs.h"
#include "bfd.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "inferior.h"
#include "infrun.h"
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index e2129409c19c..f2f8602f23c6 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -23,7 +23,7 @@
#include "frame-base.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "inferior.h"
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index e117d8e29197..e58e44b7fd22 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -28,7 +28,7 @@
#include "trad-frame.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "inferior.h"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index b65694e697d5..be68e454f644 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -23,7 +23,7 @@
#include "bfd.h"
#include "symfile.h"
#include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "mach-o.h"
#include "aout/stab_gnu.h"
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index ddabfede0f55..bf7e43a8530f 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -24,7 +24,7 @@
#include "cli/cli-style.h"
#include "cli/cli-utils.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "linespec.h"
\f
diff --git a/gdb/maint-test-options.c b/gdb/maint-test-options.c
index f671771f3b37..48b68f910844 100644
--- a/gdb/maint-test-options.c
+++ b/gdb/maint-test-options.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-option.h"
/* This file defines three "maintenance test-options" subcommands to
diff --git a/gdb/maint-test-settings.c b/gdb/maint-test-settings.c
index 61456911589d..1aaacc22edbd 100644
--- a/gdb/maint-test-settings.c
+++ b/gdb/maint-test-settings.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
/* Command list for "maint set test-settings". */
static cmd_list_element *maintenance_set_test_settings_list;
diff --git a/gdb/maint.c b/gdb/maint.c
index 6a5a55afebf8..d0916347f94c 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -25,7 +25,6 @@
#include <cmath>
#include <signal.h>
#include "command.h"
-#include "gdbcmd.h"
#include "symtab.h"
#include "block.h"
#include "gdbtypes.h"
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 062611e8ee6f..735068e5a468 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "memattr.h"
#include "target.h"
#include "target-dcache.h"
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 7d87d6410086..913889ecfb2d 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -25,7 +25,7 @@
#include "frame-base.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "inferior.h"
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 7f8a34ba18f1..a758b689ae72 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -50,7 +50,7 @@
#include "ada-lang.h"
#include "linespec.h"
#include "extension.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "observable.h"
#include <optional>
#include "gdbsupport/byte-vector.h"
diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 999a3bc27126..49cdfc601342 100644
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -22,7 +22,7 @@
#include "symtab.h"
#include "target.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symfile.h"
#include "objfiles.h"
#include "regcache.h"
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 8d045c69c109..3d768d7e1618 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -24,7 +24,7 @@
#include "trad-frame.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "breakpoint.h"
#include "inferior.h"
#include "regcache.h"
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 97ec72e5d731..3d072ea935cf 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "mips-tdep.h"
#include "target.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 0abac41e3f9e..ae58d7c87206 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -25,7 +25,7 @@
#include "inferior.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "gdbcore.h"
#include "symfile.h"
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 3bfde1be6659..29ad1f2bb2e2 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -23,7 +23,7 @@
#include "frame-base.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "inferior.h"
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 956eb023eb9f..130c0154a605 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -29,7 +29,7 @@
#include "inferior.h"
#include "gdbtypes.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "osabi.h"
#include "target.h"
#include "dis-asm.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index b36816898a5e..61b444d4e175 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -35,7 +35,7 @@
#include "objfiles.h"
#include "target.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "frame.h"
#include "gdbsupport/gdb_regex.h"
#include "regcache.h"
diff --git a/gdb/observable.c b/gdb/observable.c
index 0527cc68e2c0..7816d214ad8b 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -19,7 +19,7 @@
#include "observable.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
namespace gdb
{
diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index db74b590f182..290f748cc565 100644
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -21,7 +21,7 @@
#include "inferior.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "gdbcore.h"
#include "symfile.h"
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 016c203f47fe..d494d8996234 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -20,7 +20,7 @@
#include "osabi.h"
#include "arch-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "command.h"
#include "gdb_bfd.h"
diff --git a/gdb/osdata.c b/gdb/osdata.c
index 6dea1003cd2c..e4d9b0bef978 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -21,7 +21,7 @@
#include "xml-support.h"
#include "osdata.h"
#include "ui-out.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#if !defined(HAVE_LIBEXPAT)
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 87c0c35cb997..bdb9524d969c 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -26,7 +26,7 @@
#include "expression.h"
#include "value.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "demangle.h"
#include "valprint.h"
diff --git a/gdb/parse.c b/gdb/parse.c
index fecaa81c318a..0a2b2a5b2abf 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -39,7 +39,7 @@
#include "command.h"
#include "language.h"
#include "parser-defs.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symfile.h"
#include "inferior.h"
#include "target-float.h"
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index e70eb2e8b66f..e1000452390c 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -23,7 +23,7 @@
#include "symtab.h"
#include "target.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symfile.h"
#include "objfiles.h"
#include "regcache.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 25e391b15d5c..1d6a4922b8e7 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -28,7 +28,7 @@
#include "c-lang.h"
#include "expression.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "breakpoint.h"
#include "demangle.h"
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index 0d3f389afdb5..55e3919b978d 100644
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -24,7 +24,7 @@
* Pretty-print trace of api calls to the /proc api
*/
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "completer.h"
#include <sys/types.h>
diff --git a/gdb/procfs.c b/gdb/procfs.c
index d61340420e72..b5bda4dfb858 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -26,7 +26,7 @@
#include "target.h"
#include "gdbcore.h"
#include "elf-bfd.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "regcache.h"
#include "inf-child.h"
diff --git a/gdb/progspace.c b/gdb/progspace.c
index c3a9909dcd4b..0deca3f23762 100644
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "arch-utils.h"
#include "gdbcore.h"
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 8edadf3a335b..20822c3101e0 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -32,7 +32,7 @@
#include "dictionary.h"
#include "language.h"
#include "cp-support.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include <algorithm>
#include <set>
#include "gdbsupport/buildargv.h"
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 8a3327b37226..9548973285c1 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "top.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "python.h"
#include "auto-load.h"
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index cd9ef3093c16..da74d69d3577 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -22,7 +22,7 @@
#include "python.h"
#include "charset.h"
#include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "observable.h"
#include "cli/cli-script.h"
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index f18a8e8eaa9a..f83b45dd2106 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -22,7 +22,7 @@
#include "value.h"
#include "python-internal.h"
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "completer.h"
#include "language.h"
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 077396cb93ec..2bbfb9d3a6dc 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -21,7 +21,7 @@
#include "value.h"
#include "python-internal.h"
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "completer.h"
#include "expression.h"
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index ba837566343e..621f85da3f83 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -21,7 +21,7 @@
#include "value.h"
#include "python-internal.h"
#include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "completer.h"
#include "language.h"
diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 8c34add0d771..36454fc669fc 100644
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "btrace.h"
#include "py-record.h"
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 58bcf40e1c9f..a86ccd2c94e0 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -20,7 +20,7 @@
#include "arch-utils.h"
#include "frame-unwind.h"
#include "gdbsupport/gdb_obstack.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "observable.h"
#include "python-internal.h"
diff --git a/gdb/python/python.c b/gdb/python/python.c
index a6875af63db7..8121e5d6f2a9 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -21,7 +21,7 @@
#include "command.h"
#include "ui-out.h"
#include "cli/cli-script.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "progspace.h"
#include "objfiles.h"
#include "value.h"
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 55d54f4bdf13..1957f3ca2e3d 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -26,7 +26,7 @@
#include "command.h"
#include "ravenscar-thread.h"
#include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "top.h"
#include "regcache.h"
#include "objfiles.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index aac59ee6a6dc..9fec61127554 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -23,7 +23,7 @@
#include "record-btrace.h"
#include "gdbthread.h"
#include "target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "disasm.h"
#include "observable.h"
#include "cli/cli-utils.h"
diff --git a/gdb/record-full.c b/gdb/record-full.c
index d288eb957fee..c51aadfef335 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "gdbthread.h"
#include "inferior.h"
diff --git a/gdb/record.c b/gdb/record.c
index 2059fb7ea0cf..b25445713fd7 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "completer.h"
#include "record.h"
#include "observable.h"
diff --git a/gdb/regcache-dump.c b/gdb/regcache-dump.c
index 33205a4241d8..bc665dc08a67 100644
--- a/gdb/regcache-dump.c
+++ b/gdb/regcache-dump.c
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "gdbsupport/def-vector.h"
#include "valprint.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 0e754ec54379..f04354d822f9 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -24,7 +24,6 @@
#include "test-target.h"
#include "scoped-mock-context.h"
#include "gdbarch.h"
-#include "gdbcmd.h"
#include "regcache.h"
#include "reggroups.h"
#include "observable.h"
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 8fb21bd7622d..b2ac62c62b14 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -24,7 +24,7 @@
#include "gdbtypes.h"
#include "regcache.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbsupport/gdb_obstack.h"
/* See reggroups.h. */
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index bdb3c22b6923..b15824637a94 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -21,7 +21,7 @@
#include "event-top.h"
#include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "remote.h"
#include "gdbsupport/gdb_wait.h"
#include <sys/stat.h>
diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c
index 9acf3f8dc78e..d16f8d76dffa 100644
--- a/gdb/remote-notif.c
+++ b/gdb/remote-notif.c
@@ -38,7 +38,7 @@
#include "target.h"
#include "inferior.h"
#include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "async-event.h"
bool notif_debug = false;
diff --git a/gdb/remote.c b/gdb/remote.c
index cfb54de157d7..c1a6c137dd4a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -27,7 +27,7 @@
#include "symfile.h"
#include "target.h"
#include "process-stratum-target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "gdbthread.h"
#include "remote.h"
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 89091689f6e8..d592d2dc0c41 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -22,7 +22,7 @@
#include "inferior.h"
#include "symtab.h"
#include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "language.h"
#include "gdbcore.h"
#include "symfile.h"
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index e0698928dc85..2edb8234e6b4 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -24,7 +24,7 @@
#include "symtab.h"
#include "target.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "arch-utils.h"
#include "regcache.h"
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 29d4ef3b71ce..c24c75665ed7 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -24,7 +24,7 @@
#include "gdbsupport/errors.h"
#include "frame-unwind.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include "opcode/s12z.h"
#include "trad-frame.h"
diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index 6bb84b2ff696..6b2b6f1bf315 100644
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -28,7 +28,7 @@
#include "gregset.h"
#include "regset.h"
#include "nat/linux-ptrace.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbarch.h"
#include "s390-tdep.h"
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index ae71f73cce92..2802a44241b8 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -21,7 +21,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "serial.h"
/*
* NS16550 UART registers
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 6efc2457bdb7..18d912322417 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -20,7 +20,7 @@
#include "serial.h"
#include "ser-base.h"
#include "ser-tcp.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "cli/cli-setshow.h"
#include "gdbsupport/filestuff.h"
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index db1464f8f6e8..02845aa938b0 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -28,7 +28,7 @@
#include "gdbsupport/gdb_sys_time.h"
#include "gdbsupport/gdb_select.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbsupport/filestuff.h"
#include <termios.h>
#include "gdbsupport/scoped_ignore_sigttou.h"
diff --git a/gdb/serial.c b/gdb/serial.c
index aeab7ebcfb08..f96668abacce 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -19,7 +19,7 @@
#include <ctype.h>
#include "serial.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "cli/cli-utils.h"
/* Is serial being debugged? */
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index efbe15647679..0a3b50702d95 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -27,7 +27,7 @@
#include "dwarf2/frame.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "dis-asm.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index 9b8a56cadefa..4dff5c5a9e5f 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -21,7 +21,7 @@
#include "valprint.h"
#include "ui-out.h"
#include "symtab.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "command.h"
#include "completer.h"
#include "stack.h"
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 7c17601d5608..77740fed5d96 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -57,7 +57,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <dlfcn.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "regcache.h"
#include "solib.h"
diff --git a/gdb/source.c b/gdb/source.c
index 432301e2a717..24a8769da914 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -22,7 +22,7 @@
#include "language.h"
#include "command.h"
#include "source.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "frame.h"
#include "value.h"
#include "gdbsupport/filestuff.h"
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 0eaaf506b3c0..7d44b1e16a01 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -67,7 +67,7 @@
#include <algorithm>
#include "cli/cli-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "auxv.h"
#define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/9999/adi/lstatus")
diff --git a/gdb/stack.c b/gdb/stack.c
index fae1fce1c39f..c2323e1726d9 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -26,7 +26,7 @@
#include "expression.h"
#include "language.h"
#include "frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "target.h"
#include "source.h"
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 8646f874dcc9..9558351f93d7 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -24,7 +24,7 @@
#include "objfiles.h"
#include "arch-utils.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "filenames.h"
#include "value.h"
#include "ax.h"
diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index bc70447600ee..86c7010b2d29 100644
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -25,7 +25,7 @@
and then if the function returns a result printing a message after it
returns. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "objfiles.h"
#include "observable.h"
#include "source.h"
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 87fcc076986e..ec50ec4e33c6 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -44,7 +44,7 @@
#include "symtab.h"
#include "gdbcore.h"
#include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "value.h"
#include "symfile.h"
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 883f1c0b0505..7ebb07d5394b 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -31,7 +31,7 @@
#include "symfile.h"
#include "objfiles.h"
#include "source.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "breakpoint.h"
#include "language.h"
#include "complaints.h"
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 70435996a8ec..f5f4865cb621 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include "dictionary.h"
#include "typeprint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "source.h"
#include "readline/tilde.h"
#include <cli/cli-style.h>
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 63b780bb66ed..aa27d4468980 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -27,7 +27,6 @@
#include "value.h"
#include "symfile.h"
#include "objfiles.h"
-#include "gdbcmd.h"
#include "gdbsupport/gdb_regex.h"
#include "expression.h"
#include "language.h"
diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c
index 7c6bcd8d18c9..6a51bc6c8b16 100644
--- a/gdb/target-dcache.c
+++ b/gdb/target-dcache.c
@@ -16,7 +16,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "target-dcache.h"
-#include "gdbcmd.h"
#include "progspace.h"
#include "cli/cli-cmds.h"
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 8aca5cf719ba..4f2104416236 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "arch-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbtypes.h"
#include "reggroups.h"
#include "target.h"
diff --git a/gdb/target.c b/gdb/target.c
index 091dc4cc8ac0..a5c92a8a5119 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -22,7 +22,7 @@
#include "target.h"
#include "extract-store-integer.h"
#include "target-dcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "symtab.h"
#include "inferior.h"
#include "infrun.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index 43c28be384ff..4ee469368610 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -29,7 +29,7 @@
#include "target.h"
#include "gdbthread.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "btrace.h"
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index ac6e291bacc2..6732478eb09b 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -29,7 +29,7 @@
#include "inferior.h"
#include "gdbtypes.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "dis-asm.h"
#include "regcache.h"
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 70a956139a3f..92f2be0b2082 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -25,7 +25,7 @@
#include "trad-frame.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "dis-asm.h"
diff --git a/gdb/top.c b/gdb/top.c
index ee45f48b4fdd..b93ef0a69b59 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -17,7 +17,6 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
#include "cli/cli-cmds.h"
#include "cli/cli-script.h"
#include "cli/cli-setshow.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 0c0a94573bb7..e9bcbfdd5b39 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -23,7 +23,7 @@
#include "frame.h"
#include "gdbtypes.h"
#include "expression.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "value.h"
#include "target.h"
#include "target-dcache.h"
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 88e1c5a34105..8db269181237 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -24,7 +24,7 @@
#include "tui/tui-data.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "frame.h"
#include "regcache.h"
#include "inferior.h"
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index ced7e254f505..8f4c7ecc5959 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -33,7 +33,6 @@
#include "top.h"
#include "source.h"
#include "gdbsupport/event-loop.h"
-#include "gdbcmd.h"
#include "async-event.h"
#include "utils.h"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 01e8d7cb9268..cb21d68e9b62 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "event-top.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "tui/tui.h"
#include "tui/tui-hooks.h"
#include "tui/tui-command.h"
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 4d0e764274a1..ccc621ffd544 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -25,7 +25,7 @@
#include "value.h"
#include "gdbcore.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "language.h"
#include "cp-abi.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 8d7ef7e3ad02..17498e04312c 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -37,7 +37,7 @@
#endif
#include <signal.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "serial.h"
#include "bfd.h"
#include "target.h"
diff --git a/gdb/valops.c b/gdb/valops.c
index 8eae7cf79953..a0e945cf1554 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -28,7 +28,7 @@
#include "target.h"
#include "demangle.h"
#include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "regcache.h"
#include "cp-abi.h"
#include "block.h"
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 21265ada2ddb..db8affeb47a3 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -23,7 +23,7 @@
#include "gdbtypes.h"
#include "value.h"
#include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "language.h"
#include "annotate.h"
diff --git a/gdb/value.c b/gdb/value.c
index 4df19fde3046..e71f38b0ce43 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -24,7 +24,7 @@
#include "value.h"
#include "gdbcore.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "target.h"
#include "language.h"
#include "demangle.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 8ce3cbdd440f..0cd0bd03b6e2 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -19,7 +19,7 @@
#include "expression.h"
#include "frame.h"
#include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "block.h"
#include "valprint.h"
#include "gdbsupport/gdb_regex.h"
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index a53b6a6e053e..325c4d11ad87 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -50,7 +50,7 @@
#include "gdb_bfd.h"
#include "gdbsupport/gdb_obstack.h"
#include "gdbthread.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include <unistd.h>
#include "exec.h"
#include "solist.h"
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index af5ccd1a6297..8a29a33042fc 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -24,7 +24,7 @@
#include "value.h"
#include "inferior.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbthread.h"
#include "objfiles.h"
#include "symfile.h"
diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
index 5826716a1f8d..84c835f8a30b 100644
--- a/gdb/x86-nat.c
+++ b/gdb/x86-nat.c
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "x86-nat.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "inferior.h"
#include <unordered_map>
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 583e101c25f4..b60b2c531a7c 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "xml-builtin.h"
#include "xml-support.h"
#include "gdbsupport/filestuff.h"
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index a0f6c319b126..766d1d144beb 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -24,7 +24,7 @@
#include "dwarf2/frame.h"
#include "symtab.h"
#include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "value.h"
#include "dis-asm.h"
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 9dcd3ef06fa1..840768b65c79 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -37,7 +37,7 @@
#include "gdbarch.h"
#include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "xtensa-isa.h"
#include "xtensa-tdep.h"
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index 530139dbb61c..23cdb68e1902 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -24,7 +24,7 @@
#include "frame-unwind.h"
#include "frame-base.h"
#include "trad-frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
#include "gdbcore.h"
#include "gdbtypes.h"
#include "inferior.h"
--
2.44.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] Remove gdbcmd.h
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
` (3 preceding siblings ...)
2024-04-23 19:22 ` [PATCH 4/4] gdb: remove gdbcmd.h Simon Marchi
@ 2024-04-25 13:55 ` Tom Tromey
2024-04-25 17:05 ` Simon Marchi
4 siblings, 1 reply; 7+ messages in thread
From: Tom Tromey @ 2024-04-25 13:55 UTC (permalink / raw)
To: Simon Marchi; +Cc: gdb-patches
>>>>> "Simon" == Simon Marchi <simon.marchi@polymtl.ca> writes:
Simon> gdbcmd.h is a remnant from the past, move all the declarations it holds
Simon> in more appropriate headers and remove it.
Maybe it's a leftover from the old libgdb thing. I don't really know.
Anyway, thank you.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] Remove gdbcmd.h
2024-04-25 13:55 ` [PATCH 0/4] Remove gdbcmd.h Tom Tromey
@ 2024-04-25 17:05 ` Simon Marchi
0 siblings, 0 replies; 7+ messages in thread
From: Simon Marchi @ 2024-04-25 17:05 UTC (permalink / raw)
To: Tom Tromey; +Cc: gdb-patches
On 4/25/24 9:55 AM, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi <simon.marchi@polymtl.ca> writes:
>
> Simon> gdbcmd.h is a remnant from the past, move all the declarations it holds
> Simon> in more appropriate headers and remove it.
>
> Maybe it's a leftover from the old libgdb thing. I don't really know.
> Anyway, thank you.
> Approved-By: Tom Tromey <tom@tromey.com>
>
> Tom
Thanks, pushed.
Simon
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-04-25 17:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-23 19:22 [PATCH 0/4] Remove gdbcmd.h Simon Marchi
2024-04-23 19:22 ` [PATCH 1/4] gdb: move execute function declarations from gdbcmd.h to top.h Simon Marchi
2024-04-23 19:22 ` [PATCH 2/4] gdb: remove unused print_command_line and print_command_lines declarations Simon Marchi
2024-04-23 19:22 ` [PATCH 3/4] gdb: move style_set_list/style_show_list declarations to cli/cli-style.h Simon Marchi
2024-04-23 19:22 ` [PATCH 4/4] gdb: remove gdbcmd.h Simon Marchi
2024-04-25 13:55 ` [PATCH 0/4] Remove gdbcmd.h Tom Tromey
2024-04-25 17:05 ` Simon Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).