2005-02-20 Andrew Cagney <cagney@gnu.org>

	* symfile-mem.c (symbol_file_add_from_memory): Pass
	target_read_memory to bfd_elf_bfd_from_remote_memory.
	(do_target_read_memory): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 779696ab445d10bb99f35a5abc2cc772d8e03897..c2eccfea3be184541070fc2de35ef427cd2e162c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-20  Andrew Cagney  <cagney@gnu.org>
+
+       * symfile-mem.c (symbol_file_add_from_memory): Pass
+       target_read_memory to bfd_elf_bfd_from_remote_memory.
+       (do_target_read_memory): Delete.
+
 2005-02-16  Mark Kettenis  <kettenis@gnu.org>
 
        * value.h (value_contents_equal): New prototype.

diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 6e2fca4c2c7dece55f5afab60fc091b96af807c4..258fa18ad6027277f135860139afc1fc68badbd7 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.
+   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -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."));