From 45e1f031e823abf0fb233b3da6da099417e65bd8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 18 Apr 2020 19:28:13 -0600 Subject: [PATCH] Restore some windows-tdep.c code When I removed init_w32_command_list, I weirdly neglected to see if it was called anywhere else. This patch restores the function, which is called from windows-nat.c. Sorry about the breakage. Is it possible to have a windows-native gdb that isn't also using windows-tdep? Anyway, I'm checking this in. gdb/ChangeLog 2020-04-18 Tom Tromey * windows-tdep.c (init_w32_command_list) (w32_prefix_command_valid): Restore. (_initialize_windows_tdep): Call init_w32_command_list. --- gdb/ChangeLog | 6 ++++++ gdb/windows-tdep.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7078129fe7..366b7c087f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-04-18 Tom Tromey + + * windows-tdep.c (init_w32_command_list) + (w32_prefix_command_valid): Restore. + (_initialize_windows_tdep): Call init_w32_command_list. + 2020-04-18 Tom Tromey * xcoffread.c (enter_line_range, scan_xcoff_symtab): Update. diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 4af797f946..e2b7960829 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -602,6 +602,21 @@ show_maint_show_all_tib (struct ui_file *file, int from_tty, "Thread Information Block is %s.\n"), value); } + +static int w32_prefix_command_valid = 0; +void +init_w32_command_list (void) +{ + if (!w32_prefix_command_valid) + { + add_basic_prefix_cmd + ("w32", class_info, + _("Print information specific to Win32 debugging."), + &info_w32_cmdlist, "info w32 ", 0, &infolist); + w32_prefix_command_valid = 1; + } +} + /* Implementation of `gdbarch_gdb_signal_to_target' for Windows. */ static int @@ -1077,10 +1092,7 @@ _initialize_windows_tdep () windows_gdbarch_data_handle = gdbarch_data_register_post_init (init_windows_gdbarch_data); - add_basic_prefix_cmd ("w32", class_info, - _("Print information specific to Win32 debugging."), - &info_w32_cmdlist, "info w32 ", 0, &infolist); - + init_w32_command_list (); add_cmd ("thread-information-block", class_info, display_tib, _("Display thread information block."), &info_w32_cmdlist);