Merge GDB 7.5.1

gdb/symfile-mem.c

 /* Reading symbol files from memory.
 
    Copyright (C) 1986-1987, 1989, 1991, 1994-1996, 1998, 2000-2005,
    2007-2012 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
@@ skipping 37 matching lines @@
 #include "objfiles.h"
 #include "exceptions.h"
 #include "gdbcmd.h"
 #include "target.h"
 #include "value.h"
 #include "symfile.h"
 #include "observer.h"
 #include "auxv.h"
 #include "elf/common.h"
 
+/* Verify parameters of target_read_memory_bfd and target_read_memory are
+   compatible.  */
+
+gdb_static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma));
+gdb_static_assert (sizeof (gdb_byte) == sizeof (bfd_byte));
+gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type));
+
+/* Provide bfd/ compatible prototype for target_read_memory.  Casting would not
+   be enough as LEN width may differ.  */
+
+static int
+target_read_memory_bfd (bfd_vma memaddr, bfd_byte *myaddr, bfd_size_type len)
+{
+  /* MYADDR must be already allocated for the LEN size so it has to fit in
+     ssize_t.  */
+  gdb_assert ((ssize_t) len == len);
+
+  return target_read_memory (memaddr, 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
    symbol file in messages; it can be NULL or a malloc-allocated string
    which will be attached to the BFD.  */
 static struct objfile *
 symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, char *name,
                              int from_tty)
 {
   struct objfile *objf;
   struct bfd *nbfd;
   struct bfd_section *sec;
   bfd_vma loadbase;
   struct section_addr_info *sai;
   unsigned int i;
   struct cleanup *cleanup;
 
   if (bfd_get_flavour (templ) != bfd_target_elf_flavour)
     error (_("add-symbol-file-from-memory not supported for this target"));
 
   nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
-                                         target_read_memory);
+                                         target_read_memory_bfd);
   if (nbfd == NULL)
     error (_("Failed to read a valid object file image from memory."));
 
   if (name == NULL)
     nbfd->filename = xstrdup ("shared object read from target memory");
   else
     nbfd->filename = name;
 
   if (!bfd_check_format (nbfd, bfd_object))
     {
@@ skipping 132 matching lines @@
            _("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."),
            &cmdlist);
 
   /* Want to know of each new inferior so that its vsyscall info can
      be extracted.  */
   observer_attach_inferior_created (add_vsyscall_page);
 }