* emultempl/mmixelf.em: Remove incorrect '#line' directive.

[deliverable/binutils-gdb.git] / gdb / symfile-mem.c

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 2094a9c2a41f4c96e05b80b98eb33b868b9af676..cfb286d478ec112bad6de7c425f87673ac7fa505 100644 (file)
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -1,7 +1,7 @@
 /* Reading symbol files from memory.
 
-   Copyright 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000,
-   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* This file defines functions (and commands to exercise those
    functions) for reading debugging information from object files
@@ -58,15 +58,6 @@
 #include "elf/common.h"
 
 
-/* FIXME: cagney/2005-01-27: Should be a function with the signature:
-   int (void *object, const bfd_byte *myaddr, int len).  */
-
-static int
-do_target_read_memory (bfd_vma vma, char *myaddr, int len)
-{
-  return target_read_memory (vma, myaddr, len);
-}
-
 /* Read inferior memory at ADDR to find the header of a loaded object file
    and read its in-core symbols out of inferior memory.  TEMPL is a bfd
    representing the target's format.  NAME is the name to use for this
@@ -87,7 +78,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name,
     error (_("add-symbol-file-from-memory not supported for this target"));
 
   nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
-                                        do_target_read_memory);
+                                        target_read_memory);
   if (nbfd == NULL)
     error (_("Failed to read a valid object file image from memory."));
 
@@ -223,10 +214,9 @@ void
 _initialize_symfile_mem (void)
 {
   add_cmd ("add-symbol-file-from-memory", class_files,
-           add_symbol_file_from_memory_command,
-           "\
+           add_symbol_file_from_memory_command, _("\
 Load the symbols out of memory from a dynamically loaded object file.\n\
-Give an expression for the address of the file's shared object file header.",
+Give an expression for the address of the file's shared object file header."),
            &cmdlist);
 
   /* Want to know of each new inferior so that its vsyscall info can