From 7099259781c6b3537acdd5b5ae0734caeb5610ba Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sun, 24 May 2009 12:27:35 +0000 Subject: [PATCH] * symfile.c (add_shared_symbol_files_command): Remove prototype and function. (_initialize _symfile): Move "add-shared-symbol-files" command and "assf" alias. * windows-nat.c (_initialize_windows_nat): to here. Change "add-shared-symbol-files" to alias. * config/i386/cygwin.mh: Remove NAT_FILE. * config/i386/mingw.mh: Remove NAT_FILE. * config/i386/mingw64.mh: Remove NAT_FILE. * config/i386/nm-cygwin.h: Remove file. * config/i386/nm-cygwin64.h: Remove file. --- gdb/ChangeLog | 15 +++++++++++++++ gdb/config/i386/cygwin.mh | 1 - gdb/config/i386/mingw.mh | 1 - gdb/config/i386/mingw64.mh | 1 - gdb/config/i386/nm-cygwin.h | 20 -------------------- gdb/config/i386/nm-cygwin64.h | 19 ------------------- gdb/symfile.c | 20 +------------------- gdb/windows-nat.c | 4 ++++ 8 files changed, 20 insertions(+), 61 deletions(-) delete mode 100644 gdb/config/i386/nm-cygwin.h delete mode 100644 gdb/config/i386/nm-cygwin64.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 786d1b0..48cbbfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2009-05-15 Pierre Muller + + * symfile.c (add_shared_symbol_files_command): Remove + prototype and function. + (_initialize _symfile): Move "add-shared-symbol-files" + command and "assf" alias. + * windows-nat.c (_initialize_windows_nat): to here. + Change "add-shared-symbol-files" to alias. + + * config/i386/cygwin.mh: Remove NAT_FILE. + * config/i386/mingw.mh: Remove NAT_FILE. + * config/i386/mingw64.mh: Remove NAT_FILE. + * config/i386/nm-cygwin.h: Remove file. + * config/i386/nm-cygwin64.h: Remove file. + 2009-05-24 Hui Zhu * i386-linux-tdep.c (I386_LINUX_RECORD_SIZE_*, diff --git a/gdb/config/i386/cygwin.mh b/gdb/config/i386/cygwin.mh index 5b5a143..b704158 100644 --- a/gdb/config/i386/cygwin.mh +++ b/gdb/config/i386/cygwin.mh @@ -1,4 +1,3 @@ MH_CFLAGS= NATDEPFILES= i386-nat.o windows-nat.o i386-windows-nat.o -NAT_FILE=nm-cygwin.h XM_CLIBS= diff --git a/gdb/config/i386/mingw.mh b/gdb/config/i386/mingw.mh index 5b5a143..b704158 100644 --- a/gdb/config/i386/mingw.mh +++ b/gdb/config/i386/mingw.mh @@ -1,4 +1,3 @@ MH_CFLAGS= NATDEPFILES= i386-nat.o windows-nat.o i386-windows-nat.o -NAT_FILE=nm-cygwin.h XM_CLIBS= diff --git a/gdb/config/i386/mingw64.mh b/gdb/config/i386/mingw64.mh index 20809b8..ba6fd9f 100644 --- a/gdb/config/i386/mingw64.mh +++ b/gdb/config/i386/mingw64.mh @@ -1,2 +1 @@ NATDEPFILES= i386-nat.o windows-nat.o amd64-windows-nat.o -NAT_FILE=nm-cygwin64.h diff --git a/gdb/config/i386/nm-cygwin.h b/gdb/config/i386/nm-cygwin.h deleted file mode 100644 index 24aa749..0000000 --- a/gdb/config/i386/nm-cygwin.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Native definitions for Intel x86 running CYGWIN. - Copyright 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - This file is part of GDB. - - 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 . */ - -#define ADD_SHARED_SYMBOL_FILES dll_symbol_command -void dll_symbol_command (char *, int); diff --git a/gdb/config/i386/nm-cygwin64.h b/gdb/config/i386/nm-cygwin64.h deleted file mode 100644 index 345423f..0000000 --- a/gdb/config/i386/nm-cygwin64.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2008, 2009 Free Software Foundation, Inc. - - This file is part of GDB. - - 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 . */ - -#define ADD_SHARED_SYMBOL_FILES dll_symbol_command -void dll_symbol_command (char *, int); diff --git a/gdb/symfile.c b/gdb/symfile.c index ea97d3c..4b8a576 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -96,8 +96,6 @@ static void symbol_file_add_main_1 (char *args, int from_tty, int flags); static void add_symbol_file_command (char *, int); -static void add_shared_symbol_files_command (char *, int); - static void reread_separate_symbols (struct objfile *objfile); static void cashier_psymtab (struct partial_symtab *); @@ -2234,16 +2232,7 @@ add_symbol_file_command (char *args, int from_tty) do_cleanups (my_cleanups); } -static void -add_shared_symbol_files_command (char *args, int from_tty) -{ -#ifdef ADD_SHARED_SYMBOL_FILES - ADD_SHARED_SYMBOL_FILES (args, from_tty); -#else - error (_("This command is not available in this configuration of GDB.")); -#endif -} - + /* Re-read symbols if a symbol-file has changed. */ void reread_symbols (void) @@ -4102,13 +4091,6 @@ with the text. SECT is a section name to be loaded at SECT_ADDR."), &cmdlist); set_cmd_completer (c, filename_completer); - c = add_cmd ("add-shared-symbol-files", class_files, - add_shared_symbol_files_command, _("\ -Load the symbols from shared objects in the dynamic linker's link map."), - &cmdlist); - c = add_alias_cmd ("assf", "add-shared-symbol-files", class_files, 1, - &cmdlist); - c = add_cmd ("load", class_files, load_command, _("\ Dynamically load FILE into the running program, and record its symbols\n\ for access from GDB.\n\ diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 32a4126..d35c255 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2205,6 +2205,10 @@ _initialize_windows_nat (void) add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1); + add_com_alias ("add-shared-symbol-files", "dll-symbols", class_alias, 1); + + add_com_alias ("assf", "dll-symbols", class_alias, 1); + #ifdef __CYGWIN__ add_setshow_boolean_cmd ("shell", class_support, &useshell, _("\ Set use of shell to start subprocess."), _("\ -- 2.7.4