2012-05-18 Sergio Durigan Junior <sergiodj@redhat.com>

[deliverable/binutils-gdb.git] / gdb / solib-frv.c

diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index a8ef73ba45fc18ee247ef7fe0cf4fa4136b4ee67..2f2c8b026af16c03aa930362ffa7b0a7dae769ba 100644 (file)
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -1,5 +1,5 @@
 /* Handle FR-V (FDPIC) shared libraries for GDB, the GNU Debugger.
 /* Handle FR-V (FDPIC) shared libraries for GDB, the GNU Debugger.

-   Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -97,6 +97,7 @@ struct int_elf32_fdpic_loadmap {
 static struct int_elf32_fdpic_loadmap *
 fetch_loadmap (CORE_ADDR ldmaddr)
 {
 static struct int_elf32_fdpic_loadmap *
 fetch_loadmap (CORE_ADDR ldmaddr)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   struct ext_elf32_fdpic_loadmap ext_ldmbuf_partial;
   struct ext_elf32_fdpic_loadmap *ext_ldmbuf;
   struct int_elf32_fdpic_loadmap *int_ldmbuf;
   struct ext_elf32_fdpic_loadmap ext_ldmbuf_partial;
   struct ext_elf32_fdpic_loadmap *ext_ldmbuf;
   struct int_elf32_fdpic_loadmap *int_ldmbuf;


@@ -113,7 +114,8 @@ fetch_loadmap (CORE_ADDR ldmaddr)
 
   /* Extract the version.  */
   version = extract_unsigned_integer (ext_ldmbuf_partial.version,
 
   /* Extract the version.  */
   version = extract_unsigned_integer (ext_ldmbuf_partial.version,

-                                      sizeof ext_ldmbuf_partial.version);
+                                      sizeof ext_ldmbuf_partial.version,
+                                     byte_order);

   if (version != 0)
     {
       /* We only handle version 0.  */
   if (version != 0)
     {
       /* We only handle version 0.  */


@@ -122,7 +124,8 @@ fetch_loadmap (CORE_ADDR ldmaddr)
 
   /* Extract the number of segments.  */
   nsegs = extract_unsigned_integer (ext_ldmbuf_partial.nsegs,
 
   /* Extract the number of segments.  */
   nsegs = extract_unsigned_integer (ext_ldmbuf_partial.nsegs,

-                                    sizeof ext_ldmbuf_partial.nsegs);
+                                    sizeof ext_ldmbuf_partial.nsegs,
+                                   byte_order);

 
   if (nsegs <= 0)
     return NULL;
 
   if (nsegs <= 0)
     return NULL;


@@ -158,13 +161,16 @@ fetch_loadmap (CORE_ADDR ldmaddr)
     {
       int_ldmbuf->segs[seg].addr
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].addr,
     {
       int_ldmbuf->segs[seg].addr
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].addr,

-                                   sizeof (ext_ldmbuf->segs[seg].addr));
+                                   sizeof (ext_ldmbuf->segs[seg].addr),
+                                   byte_order);

       int_ldmbuf->segs[seg].p_vaddr
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_vaddr,
       int_ldmbuf->segs[seg].p_vaddr
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_vaddr,

-                                   sizeof (ext_ldmbuf->segs[seg].p_vaddr));
+                                   sizeof (ext_ldmbuf->segs[seg].p_vaddr),
+                                   byte_order);

       int_ldmbuf->segs[seg].p_memsz
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_memsz,
       int_ldmbuf->segs[seg].p_memsz
        = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_memsz,

-                                   sizeof (ext_ldmbuf->segs[seg].p_memsz));
+                                   sizeof (ext_ldmbuf->segs[seg].p_memsz),
+                                   byte_order);

     }
 
   xfree (ext_ldmbuf);
     }
 
   xfree (ext_ldmbuf);


@@ -195,7 +201,7 @@ struct ext_link_map
   ext_ptr l_next, l_prev;      /* struct link_map *l_next, *l_prev; */
 };
 
   ext_ptr l_next, l_prev;      /* struct link_map *l_next, *l_prev; */
 };
 

-/* Link map info to include in an allocated so_list entry */
+/* Link map info to include in an allocated so_list entry.  */

 
 struct lm_info
   {
 
 struct lm_info
   {


@@ -218,7 +224,7 @@ struct lm_info
        caching of the dynamic relocations could be dispensed with.  */
     asymbol **dyn_syms;
     arelent **dyn_relocs;
        caching of the dynamic relocations could be dispensed with.  */
     asymbol **dyn_syms;
     arelent **dyn_relocs;

-    int dyn_reloc_count;       /* number of dynamic relocs.  */
+    int dyn_reloc_count;       /* Number of dynamic relocs.  */

 
   };
 
 
   };
 


@@ -232,108 +238,7 @@ static void frv_relocate_main_executable (void);
 static CORE_ADDR main_got (void);
 static int enable_break2 (void);
 
 static CORE_ADDR main_got (void);
 static int enable_break2 (void);
 

-/*
-
-   LOCAL FUNCTION
-
-   bfd_lookup_symbol -- lookup the value for a specific symbol
-
-   SYNOPSIS
-
-   CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname)
-
-   DESCRIPTION
-
-   An expensive way to lookup the value of a single symbol for
-   bfd's that are only temporary anyway.  This is used by the
-   shared library support to find the address of the debugger
-   interface structures in the shared library.
-
-   Note that 0 is specifically allowed as an error return (no
-   such symbol).
- */
-
-static CORE_ADDR
-bfd_lookup_symbol (bfd *abfd, char *symname)
-{
-  long storage_needed;
-  asymbol *sym;
-  asymbol **symbol_table;
-  unsigned int number_of_symbols;
-  unsigned int i;
-  struct cleanup *back_to;
-  CORE_ADDR symaddr = 0;
-
-  storage_needed = bfd_get_symtab_upper_bound (abfd);
-
-  if (storage_needed > 0)
-    {
-      symbol_table = (asymbol **) xmalloc (storage_needed);
-      back_to = make_cleanup (xfree, symbol_table);
-      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-
-      for (i = 0; i < number_of_symbols; i++)
-       {
-         sym = *symbol_table++;
-         if (strcmp (sym->name, symname) == 0)
-           {
-             /* Bfd symbols are section relative. */
-             symaddr = sym->value + sym->section->vma;
-             break;
-           }
-       }
-      do_cleanups (back_to);
-    }
-
-  if (symaddr)
-    return symaddr;
-
-  /* Look for the symbol in the dynamic string table too.  */
-
-  storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
-
-  if (storage_needed > 0)
-    {
-      symbol_table = (asymbol **) xmalloc (storage_needed);
-      back_to = make_cleanup (xfree, symbol_table);
-      number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, symbol_table);
-
-      for (i = 0; i < number_of_symbols; i++)
-       {
-         sym = *symbol_table++;
-         if (strcmp (sym->name, symname) == 0)
-           {
-             /* Bfd symbols are section relative. */
-             symaddr = sym->value + sym->section->vma;
-             break;
-           }
-       }
-      do_cleanups (back_to);
-    }
-
-  return symaddr;
-}
-
-
-/*
-
-  LOCAL FUNCTION
-
-  open_symbol_file_object
-
-  SYNOPSIS
-
-  void open_symbol_file_object (void *from_tty)
-
-  DESCRIPTION
-
-  If no open symbol file, attempt to locate and open the main symbol
-  file.
-
-  If FROM_TTYP dereferences to a non-zero integer, allow messages to
-  be printed.  This parameter is a pointer rather than an int because
-  open_symbol_file_object() is called via catch_errors() and
-  catch_errors() requires a pointer argument. */
+/* Implement the "open_symbol_file_object" target_so_ops method.  */

 
 static int
 open_symbol_file_object (void *from_ttyp)
 
 static int
 open_symbol_file_object (void *from_ttyp)


@@ -359,6 +264,7 @@ static CORE_ADDR main_lm_addr = 0;
 static CORE_ADDR
 lm_base (void)
 {
 static CORE_ADDR
 lm_base (void)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   struct minimal_symbol *got_sym;
   CORE_ADDR addr;
   gdb_byte buf[FRV_PTR_SIZE];
   struct minimal_symbol *got_sym;
   CORE_ADDR addr;
   gdb_byte buf[FRV_PTR_SIZE];


@@ -394,7 +300,7 @@ lm_base (void)
 
   if (target_read_memory (addr, buf, sizeof buf) != 0)
     return 0;
 
   if (target_read_memory (addr, buf, sizeof buf) != 0)
     return 0;

-  lm_base_cache = extract_unsigned_integer (buf, sizeof buf);
+  lm_base_cache = extract_unsigned_integer (buf, sizeof buf, byte_order);

 
   if (solib_frv_debug)
     fprintf_unfiltered (gdb_stdlog,
 
   if (solib_frv_debug)
     fprintf_unfiltered (gdb_stdlog,


@@ -405,28 +311,12 @@ lm_base (void)
 }
 
 
 }
 
 

-/* LOCAL FUNCTION
-
-   frv_current_sos -- build a list of currently loaded shared objects
-
-   SYNOPSIS
-
-   struct so_list *frv_current_sos ()
-
-   DESCRIPTION
-
-   Build a list of `struct so_list' objects describing the shared
-   objects currently loaded in the inferior.  This list does not
-   include an entry for the main executable file.
-
-   Note that we only gather information directly available from the
-   inferior --- we don't examine any of the shared library files
-   themselves.  The declaration of `struct so_list' says which fields
-   we provide values for.  */
+/* Implement the "current_sos" target_so_ops method.  */

 
 static struct so_list *
 frv_current_sos (void)
 {
 
 static struct so_list *
 frv_current_sos (void)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   CORE_ADDR lm_addr, mgot;
   struct so_list *sos_head = NULL;
   struct so_list **sos_next_ptr = &sos_head;
   CORE_ADDR lm_addr, mgot;
   struct so_list *sos_head = NULL;
   struct so_list **sos_next_ptr = &sos_head;


@@ -452,7 +342,7 @@ frv_current_sos (void)
   /* Locate the address of the first link map struct.  */
   lm_addr = lm_base ();
 
   /* Locate the address of the first link map struct.  */
   lm_addr = lm_base ();
 

-  /* We have at least one link map entry.  Fetch the the lot of them,
+  /* We have at least one link map entry.  Fetch the lot of them,

      building the solist chain.  */
   while (lm_addr)
     {
      building the solist chain.  */
   while (lm_addr)
     {


@@ -464,15 +354,18 @@ frv_current_sos (void)
                            "current_sos: reading link_map entry at %s\n",
                            hex_string_custom (lm_addr, 8));
 
                            "current_sos: reading link_map entry at %s\n",
                            hex_string_custom (lm_addr, 8));
 

-      if (target_read_memory (lm_addr, (gdb_byte *) &lm_buf, sizeof (lm_buf)) != 0)
+      if (target_read_memory (lm_addr, (gdb_byte *) &lm_buf,
+                             sizeof (lm_buf)) != 0)

        {
        {

-         warning (_("frv_current_sos: Unable to read link map entry.  Shared object chain may be incomplete."));
+         warning (_("frv_current_sos: Unable to read link map entry.  "
+                    "Shared object chain may be incomplete."));

          break;
        }
 
       got_addr
        = extract_unsigned_integer (lm_buf.l_addr.got_value,
          break;
        }
 
       got_addr
        = extract_unsigned_integer (lm_buf.l_addr.got_value,

-                                   sizeof (lm_buf.l_addr.got_value));
+                                   sizeof (lm_buf.l_addr.got_value),
+                                   byte_order);

       /* If the got_addr is the same as mgotr, then we're looking at the
         entry for the main executable.  By convention, we don't include
         this in the list of shared objects.  */
       /* If the got_addr is the same as mgotr, then we're looking at the
         entry for the main executable.  By convention, we don't include
         this in the list of shared objects.  */


@@ -486,11 +379,13 @@ frv_current_sos (void)
 
          /* Fetch the load map address.  */
          addr = extract_unsigned_integer (lm_buf.l_addr.map,
 
          /* Fetch the load map address.  */
          addr = extract_unsigned_integer (lm_buf.l_addr.map,

-                                          sizeof lm_buf.l_addr.map);
+                                          sizeof lm_buf.l_addr.map,
+                                          byte_order);

          loadmap = fetch_loadmap (addr);
          if (loadmap == NULL)
            {
          loadmap = fetch_loadmap (addr);
          if (loadmap == NULL)
            {

-             warning (_("frv_current_sos: Unable to fetch load map.  Shared object chain may be incomplete."));
+             warning (_("frv_current_sos: Unable to fetch load map.  "
+                        "Shared object chain may be incomplete."));

              break;
            }
 
              break;
            }
 


@@ -501,7 +396,8 @@ frv_current_sos (void)
          sop->lm_info->lm_addr = lm_addr;
          /* Fetch the name.  */
          addr = extract_unsigned_integer (lm_buf.l_name,
          sop->lm_info->lm_addr = lm_addr;
          /* Fetch the name.  */
          addr = extract_unsigned_integer (lm_buf.l_name,

-                                          sizeof (lm_buf.l_name));
+                                          sizeof (lm_buf.l_name),
+                                          byte_order);

          target_read_string (addr, &name_buf, SO_NAME_MAX_PATH_SIZE - 1,
                              &errcode);
 
          target_read_string (addr, &name_buf, SO_NAME_MAX_PATH_SIZE - 1,
                              &errcode);
 


@@ -528,7 +424,8 @@ frv_current_sos (void)
          main_lm_addr = lm_addr;
        }
 
          main_lm_addr = lm_addr;
        }
 

-      lm_addr = extract_unsigned_integer (lm_buf.l_next, sizeof (lm_buf.l_next));
+      lm_addr = extract_unsigned_integer (lm_buf.l_next,
+                                         sizeof (lm_buf.l_next), byte_order);

     }
 
   enable_break2 ();
     }
 
   enable_break2 ();


@@ -556,7 +453,7 @@ frv_in_dynsym_resolve_code (CORE_ADDR pc)
 /* Given a loadmap and an address, return the displacement needed
    to relocate the address.  */
 
 /* Given a loadmap and an address, return the displacement needed
    to relocate the address.  */
 

-CORE_ADDR
+static CORE_ADDR

 displacement_from_map (struct int_elf32_fdpic_loadmap *map,
                        CORE_ADDR addr)
 {
 displacement_from_map (struct int_elf32_fdpic_loadmap *map,
                        CORE_ADDR addr)
 {


@@ -585,17 +482,15 @@ enable_break_failure_warning (void)
           "and track explicitly loaded dynamic code."));
 }
 
           "and track explicitly loaded dynamic code."));
 }
 

-/*
-
-   LOCAL FUNCTION
+/* Helper function for gdb_bfd_lookup_symbol.  */

 
 

-   enable_break -- arrange for dynamic linker to hit breakpoint
-
-   SYNOPSIS
-
-   int enable_break (void)
+static int
+cmp_name (asymbol *sym, void *data)
+{
+  return (strcmp (sym->name, (const char *) data) == 0);
+}

 
 

-   DESCRIPTION
+/* Arrange for dynamic linker to hit breakpoint.

 
    The dynamic linkers has, as part of its debugger interface, support
    for arranging for the inferior to hit a breakpoint after mapping in
 
    The dynamic linkers has, as part of its debugger interface, support
    for arranging for the inferior to hit a breakpoint after mapping in


@@ -615,29 +510,21 @@ enable_break_failure_warning (void)
    using the interpreter's loadmap.  Once the relocated address
    is known, we fetch the value (address) corresponding to r_brk
    and then use that value to fetch the entry point of the function
    using the interpreter's loadmap.  Once the relocated address
    is known, we fetch the value (address) corresponding to r_brk
    and then use that value to fetch the entry point of the function

-   we're interested in.
+   we're interested in.  */

 
 

- */
-
-static int enable_break1_done = 0;

 static int enable_break2_done = 0;
 
 static int
 enable_break2 (void)
 {
 static int enable_break2_done = 0;
 
 static int
 enable_break2 (void)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   int success = 0;
   char **bkpt_namep;
   asection *interp_sect;
 
   int success = 0;
   char **bkpt_namep;
   asection *interp_sect;
 

-  if (!enable_break1_done || enable_break2_done)
+  if (enable_break2_done)

     return 1;
 
     return 1;
 

-  enable_break2_done = 1;
-
-  /* First, remove all the solib event breakpoints.  Their addresses
-     may have changed since the last time we ran the program.  */
-  remove_solib_event_breakpoints ();
-

   interp_text_sect_low = interp_text_sect_high = 0;
   interp_plt_sect_low = interp_plt_sect_high = 0;
 
   interp_text_sect_low = interp_text_sect_high = 0;
   interp_plt_sect_low = interp_plt_sect_high = 0;
 


@@ -729,10 +616,12 @@ enable_break2 (void)
            interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
        }
 
            interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
        }
 

-      addr = bfd_lookup_symbol (tmp_bfd, "_dl_debug_addr");
+      addr = gdb_bfd_lookup_symbol (tmp_bfd, cmp_name, "_dl_debug_addr");
+

       if (addr == 0)
        {
       if (addr == 0)
        {

-         warning (_("Could not find symbol _dl_debug_addr in dynamic linker"));
+         warning (_("Could not find symbol _dl_debug_addr "
+                    "in dynamic linker"));

          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;
          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;


@@ -740,46 +629,67 @@ enable_break2 (void)
 
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,
 
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,

-                           "enable_break: _dl_debug_addr (prior to relocation) = %s\n",
+                           "enable_break: _dl_debug_addr "
+                           "(prior to relocation) = %s\n",

                            hex_string_custom (addr, 8));
 
       addr += displacement_from_map (ldm, addr);
 
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,
                            hex_string_custom (addr, 8));
 
       addr += displacement_from_map (ldm, addr);
 
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,

-                           "enable_break: _dl_debug_addr (after relocation) = %s\n",
+                           "enable_break: _dl_debug_addr "
+                           "(after relocation) = %s\n",

                            hex_string_custom (addr, 8));
 
       /* Fetch the address of the r_debug struct.  */
       if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0)
        {
                            hex_string_custom (addr, 8));
 
       /* Fetch the address of the r_debug struct.  */
       if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0)
        {

-         warning (_("Unable to fetch contents of _dl_debug_addr (at address %s) from dynamic linker"),
+         warning (_("Unable to fetch contents of _dl_debug_addr "
+                    "(at address %s) from dynamic linker"),

                   hex_string_custom (addr, 8));
        }
                   hex_string_custom (addr, 8));
        }

-      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf);
+      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf, byte_order);
+
+      if (solib_frv_debug)
+       fprintf_unfiltered (gdb_stdlog,
+                           "enable_break: _dl_debug_addr[0..3] = %s\n",
+                           hex_string_custom (addr, 8));
+
+      /* If it's zero, then the ldso hasn't initialized yet, and so
+         there are no shared libs yet loaded.  */
+      if (addr == 0)
+       {
+         if (solib_frv_debug)
+           fprintf_unfiltered (gdb_stdlog,
+                               "enable_break: ldso not yet initialized\n");
+         /* Do not warn, but mark to run again.  */
+         return 0;
+       }

 
       /* Fetch the r_brk field.  It's 8 bytes from the start of
          _dl_debug_addr.  */
       if (target_read_memory (addr + 8, addr_buf, sizeof addr_buf) != 0)
        {
 
       /* Fetch the r_brk field.  It's 8 bytes from the start of
          _dl_debug_addr.  */
       if (target_read_memory (addr + 8, addr_buf, sizeof addr_buf) != 0)
        {

-         warning (_("Unable to fetch _dl_debug_addr->r_brk (at address %s) from dynamic linker"),
+         warning (_("Unable to fetch _dl_debug_addr->r_brk "
+                    "(at address %s) from dynamic linker"),

                   hex_string_custom (addr + 8, 8));
          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;
        }
                   hex_string_custom (addr + 8, 8));
          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;
        }

-      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf);
+      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf, byte_order);

 
       /* Now fetch the function entry point.  */
       if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0)
        {
 
       /* Now fetch the function entry point.  */
       if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0)
        {

-         warning (_("Unable to fetch _dl_debug_addr->.r_brk entry point (at address %s) from dynamic linker"),
+         warning (_("Unable to fetch _dl_debug_addr->.r_brk entry point "
+                    "(at address %s) from dynamic linker"),

                   hex_string_custom (addr, 8));
          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;
        }
                   hex_string_custom (addr, 8));
          enable_break_failure_warning ();
          bfd_close (tmp_bfd);
          return 0;
        }

-      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf);
+      addr = extract_unsigned_integer (addr_buf, sizeof addr_buf, byte_order);

 
       /* We're done with the temporary bfd.  */
       bfd_close (tmp_bfd);
 
       /* We're done with the temporary bfd.  */
       bfd_close (tmp_bfd);


@@ -787,8 +697,14 @@ enable_break2 (void)
       /* We're also done with the loadmap.  */
       xfree (ldm);
 
       /* We're also done with the loadmap.  */
       xfree (ldm);
 

+      /* Remove all the solib event breakpoints.  Their addresses
+         may have changed since the last time we ran the program.  */
+      remove_solib_event_breakpoints ();
+

       /* Now (finally!) create the solib breakpoint.  */
       /* Now (finally!) create the solib breakpoint.  */

-      create_solib_event_breakpoint (addr);
+      create_solib_event_breakpoint (target_gdbarch, addr);
+
+      enable_break2_done = 1;

 
       return 1;
     }
 
       return 1;
     }


@@ -805,58 +721,53 @@ enable_break (void)
 {
   asection *interp_sect;
 
 {
   asection *interp_sect;
 

-  /* Remove all the solib event breakpoints.  Their addresses
-     may have changed since the last time we ran the program.  */
-  remove_solib_event_breakpoints ();
-
-  /* Check for the presence of a .interp section.  If there is no
-     such section, the executable is statically linked.  */
-
-  interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
-
-  if (interp_sect)
+  if (symfile_objfile == NULL)

     {
     {

-      enable_break1_done = 1;
-      create_solib_event_breakpoint (symfile_objfile->ei.entry_point);
-

       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,

-                           "enable_break: solib event breakpoint placed at entry point: %s\n",
-                           hex_string_custom
-                             (symfile_objfile->ei.entry_point, 8));
+                           "enable_break: No symbol file found.\n");
+      return 0;

     }
     }

-  else
+
+  if (!symfile_objfile->ei.entry_point_p)

     {
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,
     {
       if (solib_frv_debug)
        fprintf_unfiltered (gdb_stdlog,

-                           "enable_break: No .interp section found.\n");
+                           "enable_break: Symbol file has no entry point.\n");
+      return 0;

     }
 
     }
 

-  return 1;
-}
-
-/*
-
-   LOCAL FUNCTION
-
-   special_symbol_handling -- additional shared library symbol handling
+  /* Check for the presence of a .interp section.  If there is no
+     such section, the executable is statically linked.  */

 
 

-   SYNOPSIS
+  interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");

 
 

-   void special_symbol_handling ()
+  if (interp_sect == NULL)
+    {
+      if (solib_frv_debug)
+       fprintf_unfiltered (gdb_stdlog,
+                           "enable_break: No .interp section found.\n");
+      return 0;
+    }

 
 

-   DESCRIPTION
+  create_solib_event_breakpoint (target_gdbarch,
+                                symfile_objfile->ei.entry_point);

 
 

-   Once the symbols from a shared object have been loaded in the usual
-   way, we are called to do any system specific symbol handling that 
-   is needed.
+  if (solib_frv_debug)
+    fprintf_unfiltered (gdb_stdlog,
+                       "enable_break: solib event breakpoint "
+                       "placed at entry point: %s\n",
+                       hex_string_custom (symfile_objfile->ei.entry_point,
+                                          8));
+  return 1;
+}

 
 

- */
+/* Implement the "special_symbol_handling" target_so_ops method.  */

 
 static void
 frv_special_symbol_handling (void)
 {
 
 static void
 frv_special_symbol_handling (void)
 {

-  /* Nothing needed (yet) for FRV. */
+  /* Nothing needed for FRV.  */

 }
 
 static void
 }
 
 static void


@@ -934,30 +845,14 @@ frv_relocate_main_executable (void)
   main_executable_lm_info->got_value = main_got ();
 }
 
   main_executable_lm_info->got_value = main_got ();
 }
 

-/*
-
-   GLOBAL FUNCTION
-
-   frv_solib_create_inferior_hook -- shared library startup support
-
-   SYNOPSIS
+/* Implement the "create_inferior_hook" target_solib_ops method.

 
 

-   void frv_solib_create_inferior_hook ()
-
-   DESCRIPTION
-
-   When gdb starts up the inferior, it nurses it along (through the
-   shell) until it is ready to execute it's first instruction.  At this
-   point, this function gets called via expansion of the macro
-   SOLIB_CREATE_INFERIOR_HOOK.
-
-   For the FR-V shared library ABI (FDPIC), the main executable
-   needs to be relocated.  The shared library breakpoints also need
-   to be enabled.
- */
+   For the FR-V shared library ABI (FDPIC), the main executable needs
+   to be relocated.  The shared library breakpoints also need to be
+   enabled.  */

 
 static void
 
 static void

-frv_solib_create_inferior_hook (void)
+frv_solib_create_inferior_hook (int from_tty)

 {
   /* Relocate main executable.  */
   frv_relocate_main_executable ();
 {
   /* Relocate main executable.  */
   frv_relocate_main_executable ();


@@ -974,7 +869,6 @@ static void
 frv_clear_solib (void)
 {
   lm_base_cache = 0;
 frv_clear_solib (void)
 {
   lm_base_cache = 0;

-  enable_break1_done = 0;

   enable_break2_done = 0;
   main_lm_addr = 0;
   if (main_executable_lm_info != 0)
   enable_break2_done = 0;
   main_lm_addr = 0;
   if (main_executable_lm_info != 0)


@@ -998,7 +892,7 @@ frv_free_so (struct so_list *so)
 
 static void
 frv_relocate_section_addresses (struct so_list *so,
 
 static void
 frv_relocate_section_addresses (struct so_list *so,

-                                 struct section_table *sec)
+                                 struct target_section *sec)

 {
   int seg;
   struct int_elf32_fdpic_loadmap *map;
 {
   int seg;
   struct int_elf32_fdpic_loadmap *map;


@@ -1011,6 +905,7 @@ frv_relocate_section_addresses (struct so_list *so,
           && sec->addr < map->segs[seg].p_vaddr + map->segs[seg].p_memsz)
        {
          CORE_ADDR displ = map->segs[seg].addr - map->segs[seg].p_vaddr;
           && sec->addr < map->segs[seg].p_vaddr + map->segs[seg].p_memsz)
        {
          CORE_ADDR displ = map->segs[seg].addr - map->segs[seg].p_vaddr;

+

          sec->addr += displ;
          sec->endaddr += displ;
          break;
          sec->addr += displ;
          sec->endaddr += displ;
          break;


@@ -1026,7 +921,8 @@ main_got (void)
 {
   struct minimal_symbol *got_sym;
 
 {
   struct minimal_symbol *got_sym;
 

-  got_sym = lookup_minimal_symbol ("_GLOBAL_OFFSET_TABLE_", NULL, symfile_objfile);
+  got_sym = lookup_minimal_symbol ("_GLOBAL_OFFSET_TABLE_",
+                                  NULL, symfile_objfile);

   if (got_sym == 0)
     return 0;
 
   if (got_sym == 0)
     return 0;
 


@@ -1058,14 +954,14 @@ frv_fdpic_find_global_pointer (CORE_ADDR addr)
       so = so->next;
     }
 
       so = so->next;
     }
 

-  /* Didn't find it it any of the shared objects.  So assume it's in the
+  /* Didn't find it in any of the shared objects.  So assume it's in the

      main executable.  */
   return main_got ();
 }
 
 /* Forward declarations for frv_fdpic_find_canonical_descriptor().  */
 static CORE_ADDR find_canonical_descriptor_in_load_object
      main executable.  */
   return main_got ();
 }
 
 /* Forward declarations for frv_fdpic_find_canonical_descriptor().  */
 static CORE_ADDR find_canonical_descriptor_in_load_object

-  (CORE_ADDR, CORE_ADDR, char *, bfd *, struct lm_info *);
+  (CORE_ADDR, CORE_ADDR, const char *, bfd *, struct lm_info *);

 
 /* Given a function entry point, attempt to find the canonical descriptor
    associated with that entry point.  Return 0 if no canonical descriptor
 
 /* Given a function entry point, attempt to find the canonical descriptor
    associated with that entry point.  Return 0 if no canonical descriptor


@@ -1074,13 +970,11 @@ static CORE_ADDR find_canonical_descriptor_in_load_object
 CORE_ADDR
 frv_fdpic_find_canonical_descriptor (CORE_ADDR entry_point)
 {
 CORE_ADDR
 frv_fdpic_find_canonical_descriptor (CORE_ADDR entry_point)
 {

-  char *name;
+  const char *name;

   CORE_ADDR addr;
   CORE_ADDR got_value;
   struct int_elf32_fdpic_loadmap *ldm = 0;
   struct symbol *sym;
   CORE_ADDR addr;
   CORE_ADDR got_value;
   struct int_elf32_fdpic_loadmap *ldm = 0;
   struct symbol *sym;

-  int status;
-  CORE_ADDR exec_loadmap_addr;

 
   /* Fetch the corresponding global pointer for the entry point.  */
   got_value = frv_fdpic_find_global_pointer (entry_point);
 
   /* Fetch the corresponding global pointer for the entry point.  */
   got_value = frv_fdpic_find_global_pointer (entry_point);


@@ -1123,9 +1017,10 @@ frv_fdpic_find_canonical_descriptor (CORE_ADDR entry_point)
 
 static CORE_ADDR
 find_canonical_descriptor_in_load_object
 
 static CORE_ADDR
 find_canonical_descriptor_in_load_object

-  (CORE_ADDR entry_point, CORE_ADDR got_value, char *name, bfd *abfd,
+  (CORE_ADDR entry_point, CORE_ADDR got_value, const char *name, bfd *abfd,

    struct lm_info *lm)
 {
    struct lm_info *lm)
 {

+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);

   arelent *rel;
   unsigned int i;
   CORE_ADDR addr = 0;
   arelent *rel;
   unsigned int i;
   CORE_ADDR addr = 0;


@@ -1218,18 +1113,20 @@ find_canonical_descriptor_in_load_object
          /* Fetch address of candidate descriptor.  */
          if (target_read_memory (addr, buf, sizeof buf) != 0)
            continue;
          /* Fetch address of candidate descriptor.  */
          if (target_read_memory (addr, buf, sizeof buf) != 0)
            continue;

-         addr = extract_unsigned_integer (buf, sizeof buf);
+         addr = extract_unsigned_integer (buf, sizeof buf, byte_order);

 
          /* Check for matching entry point.  */
          if (target_read_memory (addr, buf, sizeof buf) != 0)
            continue;
 
          /* Check for matching entry point.  */
          if (target_read_memory (addr, buf, sizeof buf) != 0)
            continue;

-         if (extract_unsigned_integer (buf, sizeof buf) != entry_point)
+         if (extract_unsigned_integer (buf, sizeof buf, byte_order)
+             != entry_point)

            continue;
 
          /* Check for matching got value.  */
          if (target_read_memory (addr + 4, buf, sizeof buf) != 0)
            continue;
            continue;
 
          /* Check for matching got value.  */
          if (target_read_memory (addr + 4, buf, sizeof buf) != 0)
            continue;

-         if (extract_unsigned_integer (buf, sizeof buf) != got_value)
+         if (extract_unsigned_integer (buf, sizeof buf, byte_order)
+             != got_value)

            continue;
 
          /* Match was successful!  Exit loop.  */
            continue;
 
          /* Match was successful!  Exit loop.  */


@@ -1269,6 +1166,9 @@ frv_fetch_objfile_link_map (struct objfile *objfile)
 
 struct target_so_ops frv_so_ops;
 
 
 struct target_so_ops frv_so_ops;
 

+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_frv_solib;
+

 void
 _initialize_frv_solib (void)
 {
 void
 _initialize_frv_solib (void)
 {


@@ -1280,6 +1180,7 @@ _initialize_frv_solib (void)
   frv_so_ops.current_sos = frv_current_sos;
   frv_so_ops.open_symbol_file_object = open_symbol_file_object;
   frv_so_ops.in_dynsym_resolve_code = frv_in_dynsym_resolve_code;
   frv_so_ops.current_sos = frv_current_sos;
   frv_so_ops.open_symbol_file_object = open_symbol_file_object;
   frv_so_ops.in_dynsym_resolve_code = frv_in_dynsym_resolve_code;

+  frv_so_ops.bfd_open = solib_bfd_open;

 
   /* Debug this file's internals.  */
   add_setshow_zinteger_cmd ("solib-frv", class_maintenance,
 
   /* Debug this file's internals.  */
   add_setshow_zinteger_cmd ("solib-frv", class_maintenance,