From 1a667e98b749cc82920f2cfd25d07139e5e03136 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 30 Dec 2014 11:30:01 +0400 Subject: [PATCH] Remove "dll-symbols", "add-shared-symbol-files" and assf" commands. This patch removes a set of commands that have been deprecated for a while, and which we agreed to remove after the GDB 7.8 release. gdb/ChangeLog: * windows-nat.c (safe_symbol_file_add_stub) (safe_symbol_file_add_cleanup, safe_symbol_file_add) (dll_symbol_command): Delete. (_initialize_windows_nat): Delete local variable "c". Remove "dll-symbols", "add-shared-symbol-files" and assf" commands. Tested by rebuilding GDB on x86-windows. --- gdb/ChangeLog | 9 +++++ gdb/windows-nat.c | 93 ----------------------------------------------- 2 files changed, 9 insertions(+), 93 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ef7cf4695ee..74f73aea494 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-12-30 Joel Brobecker + + * windows-nat.c (safe_symbol_file_add_stub) + (safe_symbol_file_add_cleanup, safe_symbol_file_add) + (dll_symbol_command): Delete. + (_initialize_windows_nat): Delete local variable "c". + Remove "dll-symbols", "add-shared-symbol-files" and assf" + commands. + 2014-12-29 Thomas Preud'homme * arm-tdep.c (arm_gdbarch_init): Remove casts in Tag_ABI_VFP_args switch diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 0f98793d693..721004fbace 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -551,61 +551,6 @@ struct lm_info static struct so_list solib_start, *solib_end; -/* Call symbol_file_add with stderr redirected. We don't care if there - are errors. */ -static int -safe_symbol_file_add_stub (void *argv) -{ -#define p ((struct safe_symbol_file_add_args *) argv) - const int add_flags = ((p->from_tty ? SYMFILE_VERBOSE : 0) - | (p->mainline ? SYMFILE_MAINLINE : 0)); - p->ret = symbol_file_add (p->name, add_flags, p->addrs, p->flags); - return !!p->ret; -#undef p -} - -/* Restore gdb's stderr after calling symbol_file_add. */ -static void -safe_symbol_file_add_cleanup (void *p) -{ -#define sp ((struct safe_symbol_file_add_args *)p) - gdb_flush (gdb_stderr); - gdb_flush (gdb_stdout); - ui_file_delete (gdb_stderr); - ui_file_delete (gdb_stdout); - gdb_stderr = sp->err; - gdb_stdout = sp->out; -#undef sp -} - -/* symbol_file_add wrapper that prevents errors from being displayed. */ -static struct objfile * -safe_symbol_file_add (char *name, int from_tty, - struct section_addr_info *addrs, - int mainline, int flags) -{ - struct safe_symbol_file_add_args p; - struct cleanup *cleanup; - - cleanup = make_cleanup (safe_symbol_file_add_cleanup, &p); - - p.err = gdb_stderr; - p.out = gdb_stdout; - gdb_flush (gdb_stderr); - gdb_flush (gdb_stdout); - gdb_stderr = ui_file_new (); - gdb_stdout = ui_file_new (); - p.name = name; - p.from_tty = from_tty; - p.addrs = addrs; - p.mainline = mainline; - p.flags = flags; - catch_errors (safe_symbol_file_add_stub, &p, "", RETURN_MASK_ERROR); - - do_cleanups (cleanup); - return p.ret; -} - static struct so_list * windows_make_so (const char *name, LPVOID load_addr) { @@ -854,28 +799,6 @@ windows_clear_solib (void) solib_end = &solib_start; } -/* Load DLL symbol info. */ -static void -dll_symbol_command (char *args, int from_tty) -{ - int n; - dont_repeat (); - - if (args == NULL) - error (_("dll-symbols requires a file name")); - - n = strlen (args); - if (n > 4 && strcasecmp (args + n - 4, ".dll") != 0) - { - char *newargs = (char *) alloca (n + 4 + 1); - strcpy (newargs, args); - strcat (newargs, ".dll"); - args = newargs; - } - - safe_symbol_file_add (args, from_tty, NULL, 0, OBJF_SHARED | OBJF_USERLOADED); -} - /* Handle DEBUG_STRING output from child process. Cygwin prepends its messages with a "cygwin:". Interpret this as a Cygwin signal. Otherwise just print the string as a warning. */ @@ -2587,7 +2510,6 @@ extern initialize_file_ftype _initialize_windows_nat; void _initialize_windows_nat (void) { - struct cmd_list_element *c; struct target_ops *t; t = windows_target (); @@ -2610,21 +2532,6 @@ _initialize_windows_nat (void) cygwin_internal (CW_SET_DOS_FILE_WARNING, 0); #endif - c = add_com ("dll-symbols", class_files, dll_symbol_command, - _("Load dll library symbols from FILE.")); - set_cmd_completer (c, filename_completer); - deprecate_cmd (c, "sharedlibrary"); - - c = add_com ("add-shared-symbol-files", class_files, dll_symbol_command, - _("Load dll library symbols from FILE.")); - set_cmd_completer (c, filename_completer); - deprecate_cmd (c, "sharedlibrary"); - - c = add_com ("assf", class_files, dll_symbol_command, - _("Load dll library symbols from FILE.")); - set_cmd_completer (c, filename_completer); - deprecate_cmd (c, "sharedlibrary"); - #ifdef __CYGWIN__ add_setshow_boolean_cmd ("shell", class_support, &useshell, _("\ Set use of shell to start subprocess."), _("\ -- 2.30.2