X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsolib-som.c;h=6100cbe6748f83fb7803d8f63a3817dcff16eb6b;hb=71bdabee218e22fa592ab679a2d1ee044e0f6e2c;hp=886eb4b7bd23602d081b5eb0233a950960cee0e2;hpb=ff644745cdc10d5dd58cb49c9968f971f72f6263;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/solib-som.c b/gdb/solib-som.c
index 886eb4b7bd..6100cbe674 100644
--- a/gdb/solib-som.c
+++ b/gdb/solib-som.c
@@ -1,12 +1,12 @@
-/* Handle SOM shared libraries for GDB, the GNU Debugger.
+/* Handle SOM shared libraries.
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004-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 2 of the License, or
+   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,
@@ -15,12 +15,9 @@
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "som.h"
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
@@ -31,14 +28,18 @@
 
 #include "hppa-tdep.h"
 #include "solist.h"
+#include "solib.h"
+#include "solib-som.h"
+
+#include <string.h>
 
 #undef SOLIB_SOM_DBG 
 
 /* These ought to be defined in some public interface, but aren't.  They
    define the meaning of the various bits in the distinguished __dld_flags
    variable that is declared in every debuggable a.out on HP-UX, and that
-   is shared between the debugger and the dynamic linker.
- */
+   is shared between the debugger and the dynamic linker.  */
+
 #define DLD_FLAGS_MAPPRIVATE    0x1
 #define DLD_FLAGS_HOOKVALID     0x2
 #define DLD_FLAGS_LISTVALID     0x4
@@ -46,7 +47,8 @@
 
 struct lm_info
   {
-    /* Version of this structure (it is expected to change again in hpux10).  */
+    /* Version of this structure (it is expected to change again in
+       hpux10).  */
     unsigned char struct_version;
 
     /* Binding mode for this library.  */
@@ -84,8 +86,8 @@ struct lm_info
   };
 
 /* These addresses should be filled in by som_solib_create_inferior_hook.
-   They are also used elsewhere in this module.
- */
+   They are also used elsewhere in this module.  */
+
 typedef struct
   {
     CORE_ADDR address;
@@ -93,7 +95,7 @@ typedef struct
   }
 addr_and_unwind_t;
 
-/* When adding fields, be sure to clear them in _initialize_som_solib. */
+/* When adding fields, be sure to clear them in _initialize_som_solib.  */
 static struct
   {
     int is_valid;
@@ -109,17 +111,10 @@ dld_cache;
 
 static void
 som_relocate_section_addresses (struct so_list *so,
-				struct section_table *sec)
+				struct target_section *sec)
 {
   flagword aflag = bfd_get_section_flags(so->abfd, sec->the_bfd_section);
 
-  /* solib.c does something similar, but it only recognizes ".text", SOM calls
-     the text section "$CODE$".  */
-  if (strcmp (sec->the_bfd_section->name, "$CODE$") == 0)
-    {
-      so->textsection = sec;
-    }
-
   if (aflag & SEC_CODE)
     {
       sec->addr    += so->lm_info->text_addr - so->lm_info->text_link_addr; 
@@ -134,6 +129,37 @@ som_relocate_section_addresses (struct so_list *so,
     ;
 }
 
+
+/* Variable storing HP-UX major release number.
+
+   On non-native system, simply assume that the major release number
+   is 11.  On native systems, hppa-hpux-nat.c initialization code
+   sets this number to the real one on startup.
+   
+   We cannot compute this value here, because we need to make a native
+   call to "uname".  We are are not allowed to do that from here, as
+   this file is used for both native and cross debugging.  */
+
+#define DEFAULT_HPUX_MAJOR_RELEASE 11
+int hpux_major_release = DEFAULT_HPUX_MAJOR_RELEASE;
+
+static int
+get_hpux_major_release (void)
+{
+  return hpux_major_release;
+}
+
+/* DL header flag defines.  */
+#define SHLIB_TEXT_PRIVATE_ENABLE 0x4000
+
+/* The DL header is documented in <shl.h>.  We are only interested
+   in the flags field to determine whether the executable wants shared
+   libraries mapped private.  */
+struct {
+    short junk[37];
+    short flags;
+} dl_header;
+
 /* This hook gets called just before the first instruction in the
    inferior process is executed.
 
@@ -155,18 +181,15 @@ som_relocate_section_addresses (struct so_list *so,
    means running until the "_start" is called.  */
 
 static void
-som_solib_create_inferior_hook (void)
+som_solib_create_inferior_hook (int from_tty)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   struct minimal_symbol *msymbol;
   unsigned int dld_flags, status, have_endo;
   asection *shlib_info;
   char buf[4];
   CORE_ADDR anaddr;
 
-  /* First, remove all the solib event breakpoints.  Their addresses
-     may have changed since the last time we ran the program.  */
-  remove_solib_event_breakpoints ();
-
   if (symfile_objfile == NULL)
     return;
 
@@ -179,6 +202,10 @@ som_solib_create_inferior_hook (void)
   if (bfd_section_size (symfile_objfile->obfd, shlib_info) == 0)
     return;
 
+  /* Read the DL header.  */
+  bfd_get_section_contents (symfile_objfile->obfd, shlib_info,
+			    (char *) &dl_header, 0, sizeof (dl_header));
+
   have_endo = 0;
   /* Slam the pid of the process into __d_pid.
 
@@ -191,13 +218,14 @@ som_solib_create_inferior_hook (void)
     goto keep_going;
 
   anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
-  store_unsigned_integer (buf, 4, PIDGET (inferior_ptid));
+  store_unsigned_integer (buf, 4, byte_order, PIDGET (inferior_ptid));
   status = target_write_memory (anaddr, buf, 4);
   if (status != 0)
     {
-      warning ("Unable to write __d_pid");
-      warning ("Suggest linking with /opt/langtools/lib/end.o.");
-      warning ("GDB will be unable to track shl_load/shl_unload calls");
+      warning (_("\
+Unable to write __d_pid.\n\
+Suggest linking with /opt/langtools/lib/end.o.\n\
+GDB will be unable to track shl_load/shl_unload calls"));
       goto keep_going;
     }
 
@@ -208,16 +236,17 @@ som_solib_create_inferior_hook (void)
      Note that the above is the pre-HP-UX 9.0 behaviour.  At 9.0 and above,
      the dld provides an export stub named "__d_trap" as well as the
      function named "__d_trap" itself, but doesn't provide "_DLD_HOOK".
-     We'll look first for the old flavor and then the new.
-   */
+     We'll look first for the old flavor and then the new.  */
+
   msymbol = lookup_minimal_symbol ("_DLD_HOOK", NULL, symfile_objfile);
   if (msymbol == NULL)
     msymbol = lookup_minimal_symbol ("__d_trap", NULL, symfile_objfile);
   if (msymbol == NULL)
     {
-      warning ("Unable to find _DLD_HOOK symbol in object file.");
-      warning ("Suggest linking with /opt/langtools/lib/end.o.");
-      warning ("GDB will be unable to track shl_load/shl_unload calls");
+      warning (_("\
+Unable to find _DLD_HOOK symbol in object file.\n\
+Suggest linking with /opt/langtools/lib/end.o.\n\
+GDB will be unable to track shl_load/shl_unload calls"));
       goto keep_going;
     }
   anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
@@ -232,14 +261,15 @@ som_solib_create_inferior_hook (void)
       anaddr = SYMBOL_VALUE (msymbol);
       dld_cache.hook_stub.address = anaddr;
     }
-  store_unsigned_integer (buf, 4, anaddr);
+  store_unsigned_integer (buf, 4, byte_order, anaddr);
 
   msymbol = lookup_minimal_symbol ("__dld_hook", NULL, symfile_objfile);
   if (msymbol == NULL)
     {
-      warning ("Unable to find __dld_hook symbol in object file.");
-      warning ("Suggest linking with /opt/langtools/lib/end.o.");
-      warning ("GDB will be unable to track shl_load/shl_unload calls");
+      warning (_("\
+Unable to find __dld_hook symbol in object file.\n\
+Suggest linking with /opt/langtools/lib/end.o.\n\
+GDB will be unable to track shl_load/shl_unload calls"));
       goto keep_going;
     }
   anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
@@ -250,12 +280,14 @@ som_solib_create_inferior_hook (void)
   msymbol = lookup_minimal_symbol ("__d_trap", NULL, symfile_objfile);
   if (msymbol == NULL)
     {
-      warning ("Unable to find __dld_d_trap symbol in object file.");
-      warning ("Suggest linking with /opt/langtools/lib/end.o.");
-      warning ("GDB will be unable to track shl_load/shl_unload calls");
+      warning (_("\
+Unable to find __dld_d_trap symbol in object file.\n\
+Suggest linking with /opt/langtools/lib/end.o.\n\
+GDB will be unable to track shl_load/shl_unload calls"));
       goto keep_going;
     }
-  create_solib_event_breakpoint (SYMBOL_VALUE_ADDRESS (msymbol));
+  create_solib_event_breakpoint (target_gdbarch,
+				 SYMBOL_VALUE_ADDRESS (msymbol));
 
   /* We have all the support usually found in end.o, so we can track
      shl_load and shl_unload calls.  */
@@ -268,7 +300,7 @@ keep_going:
   msymbol = lookup_minimal_symbol ("__dld_flags", NULL, NULL);
   if (msymbol == NULL)
     {
-      error ("Unable to find __dld_flags symbol in object file.\n");
+      error (_("Unable to find __dld_flags symbol in object file."));
     }
 
   anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
@@ -276,23 +308,34 @@ keep_going:
   /* Read the current contents.  */
   status = target_read_memory (anaddr, buf, 4);
   if (status != 0)
-    {
-      error ("Unable to read __dld_flags\n");
-    }
-  dld_flags = extract_unsigned_integer (buf, 4);
+    error (_("Unable to read __dld_flags."));
+  dld_flags = extract_unsigned_integer (buf, 4, byte_order);
+
+  /* If the libraries were not mapped private on HP-UX 11 and later, warn
+     the user.  On HP-UX 10 and earlier, there is no easy way to specify
+     that shared libraries should be privately mapped.  So, we just force
+     private mapping.  */
+  if (get_hpux_major_release () >= 11
+      && (dl_header.flags & SHLIB_TEXT_PRIVATE_ENABLE) == 0
+      && (dld_flags & DLD_FLAGS_MAPPRIVATE) == 0)
+    warning
+      (_("\
+Private mapping of shared library text was not specified\n\
+by the executable; setting a breakpoint in a shared library which\n\
+is not privately mapped will not work.  See the HP-UX 11i v3 chatr\n\
+manpage for methods to privately map shared library text."));
 
   /* Turn on the flags we care about.  */
-  dld_flags |= DLD_FLAGS_MAPPRIVATE;
+  if (get_hpux_major_release () < 11)
+    dld_flags |= DLD_FLAGS_MAPPRIVATE;
   if (have_endo)
     dld_flags |= DLD_FLAGS_HOOKVALID;
-  store_unsigned_integer (buf, 4, dld_flags);
+  store_unsigned_integer (buf, 4, byte_order, dld_flags);
   status = target_write_memory (anaddr, buf, 4);
   if (status != 0)
-    {
-      error ("Unable to write __dld_flags\n");
-    }
+    error (_("Unable to write __dld_flags."));
 
-  /* Now find the address of _start and set a breakpoint there. 
+  /* Now find the address of _start and set a breakpoint there.
      We still need this code for two reasons:
 
      * Not all sites have /opt/langtools/lib/end.o, so it's not always
@@ -303,60 +346,14 @@ keep_going:
 
   msymbol = lookup_minimal_symbol ("_start", NULL, symfile_objfile);
   if (msymbol == NULL)
-    {
-      error ("Unable to find _start symbol in object file.\n");
-    }
+    error (_("Unable to find _start symbol in object file."));
 
   anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
 
   /* Make the breakpoint at "_start" a shared library event breakpoint.  */
-  create_solib_event_breakpoint (anaddr);
+  create_solib_event_breakpoint (target_gdbarch, anaddr);
 
-  clear_symtab_users ();
-}
-
-/* This operation removes the "hook" between GDB and the dynamic linker,
-   which causes the dld to notify GDB of shared library events.
-
-   After this operation completes, the dld will no longer notify GDB of
-   shared library events.  To resume notifications, GDB must call
-   som_solib_create_inferior_hook.
-
-   This operation does not remove any knowledge of shared libraries which
-   GDB may already have been notified of.
- */
-static void
-som_solib_remove_inferior_hook (int pid)
-{
-  CORE_ADDR addr;
-  struct minimal_symbol *msymbol;
-  int status;
-  char dld_flags_buffer[4];
-  unsigned int dld_flags_value;
-  struct cleanup *old_cleanups = save_inferior_ptid ();
-
-  /* Ensure that we're really operating on the specified process. */
-  inferior_ptid = pid_to_ptid (pid);
-
-  /* We won't bother to remove the solib breakpoints from this process.
-
-     In fact, on PA64 the breakpoint is hard-coded into the dld callback,
-     and thus we're not supposed to remove it.
-
-     Rather, we'll merely clear the dld_flags bit that enables callbacks.
-   */
-  msymbol = lookup_minimal_symbol ("__dld_flags", NULL, NULL);
-
-  addr = SYMBOL_VALUE_ADDRESS (msymbol);
-  status = target_read_memory (addr, dld_flags_buffer, 4);
-
-  dld_flags_value = extract_unsigned_integer (dld_flags_buffer, 4);
-
-  dld_flags_value &= ~DLD_FLAGS_HOOKVALID;
-  store_unsigned_integer (dld_flags_buffer, 4, dld_flags_value);
-  status = target_write_memory (addr, dld_flags_buffer, 4);
-
-  do_cleanups (old_cleanups);
+  clear_symtab_users (0);
 }
 
 static void
@@ -375,8 +372,8 @@ som_solib_desire_dynamic_linker_symbols (void)
      we've no work to do.
 
      (If you add clauses to this test, be sure to likewise update the
-     test within the loop.)
-   */
+     test within the loop.)  */
+
   if (dld_cache.is_valid)
     return;
 
@@ -393,7 +390,7 @@ som_solib_desire_dynamic_linker_symbols (void)
 							  objfile);
     if (dld_msymbol != NULL)
       {
-	if (SYMBOL_TYPE (dld_msymbol) == mst_solib_trampoline)
+	if (MSYMBOL_TYPE (dld_msymbol) == mst_solib_trampoline)
 	  {
 	    u = find_unwind_entry (SYMBOL_VALUE (dld_msymbol));
 	    if ((u != NULL) && (u->stub_unwind.stub_type == EXPORT))
@@ -415,8 +412,8 @@ som_solib_desire_dynamic_linker_symbols (void)
 	   cover the body of "shl_unload", the second being 4 bytes past
 	   the end of the first.  This is a large hack to handle that
 	   case, but since I don't seem to have any legitimate way to
-	   look for this thing via the symbol table...
-	 */
+	   look for this thing via the symbol table...  */
+
 	if (dld_cache.unload.unwind != NULL)
 	  {
 	    u = find_unwind_entry (dld_cache.unload.unwind->region_end + 4);
@@ -432,7 +429,7 @@ som_solib_desire_dynamic_linker_symbols (void)
 							  objfile);
     if (dld_msymbol != NULL)
       {
-	if (SYMBOL_TYPE (dld_msymbol) == mst_solib_trampoline)
+	if (MSYMBOL_TYPE (dld_msymbol) == mst_solib_trampoline)
 	  {
 	    u = find_unwind_entry (SYMBOL_VALUE (dld_msymbol));
 	    if ((u != NULL) && (u->stub_unwind.stub_type == EXPORT))
@@ -443,7 +440,7 @@ som_solib_desire_dynamic_linker_symbols (void)
 	  }
       }
 
-    /* Did we find everything we were looking for?  If so, stop. */
+    /* Did we find everything we were looking for?  If so, stop.  */
     if ((dld_cache.load.address != 0)
 	&& (dld_cache.load_stub.address != 0)
 	&& (dld_cache.unload.address != 0)
@@ -458,8 +455,7 @@ som_solib_desire_dynamic_linker_symbols (void)
   dld_cache.hook_stub.unwind = find_unwind_entry (dld_cache.hook_stub.address);
 
   /* We're prepared not to find some of these symbols, which is why
-     this function is a "desire" operation, and not a "require".
-   */
+     this function is a "desire" operation, and not a "require".  */
 }
 
 static int
@@ -475,17 +471,17 @@ som_in_dynsym_resolve_code (CORE_ADDR pc)
      weren't mapped to a (writeable) private region.  However, in
      that case the debugger probably isn't able to set the fundamental
      breakpoint in the dld callback anyways, so this hack should be
-     safe.
-   */
+     safe.  */
+
   if ((pc & (CORE_ADDR) 0xc0000000) == (CORE_ADDR) 0xc0000000)
     return 1;
 
   /* Cache the address of some symbols that are part of the dynamic
-     linker, if not already known.
-   */
+     linker, if not already known.  */
+
   som_solib_desire_dynamic_linker_symbols ();
 
-  /* Are we in the dld callback?  Or its export stub? */
+  /* Are we in the dld callback?  Or its export stub?  */
   u_pc = find_unwind_entry (pc);
   if (u_pc == NULL)
     return 0;
@@ -493,7 +489,7 @@ som_in_dynsym_resolve_code (CORE_ADDR pc)
   if ((u_pc == dld_cache.hook.unwind) || (u_pc == dld_cache.hook_stub.unwind))
     return 1;
 
-  /* Or the interface of the dld (i.e., "shl_load" or friends)? */
+  /* Or the interface of the dld (i.e., "shl_load" or friends)?  */
   if ((u_pc == dld_cache.load.unwind)
       || (u_pc == dld_cache.unload.unwind)
       || (u_pc == dld_cache.unload2.unwind)
@@ -501,7 +497,7 @@ som_in_dynsym_resolve_code (CORE_ADDR pc)
       || (u_pc == dld_cache.unload_stub.unwind))
     return 1;
 
-  /* Apparently this address isn't part of the dld's text. */
+  /* Apparently this address isn't part of the dld's text.  */
   return 0;
 }
 
@@ -527,6 +523,7 @@ struct dld_list {
 static CORE_ADDR
 link_map_start (void)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   struct minimal_symbol *sym;
   CORE_ADDR addr;
   char buf[4];
@@ -534,24 +531,12 @@ link_map_start (void)
 
   sym = lookup_minimal_symbol ("__dld_flags", NULL, NULL);
   if (!sym)
-    {
-      error ("Unable to find __dld_flags symbol in object file.\n");
-      return 0;
-    }
+    error (_("Unable to find __dld_flags symbol in object file."));
   addr = SYMBOL_VALUE_ADDRESS (sym);
   read_memory (addr, buf, 4);
-  dld_flags = extract_unsigned_integer (buf, 4);
+  dld_flags = extract_unsigned_integer (buf, 4, byte_order);
   if ((dld_flags & DLD_FLAGS_LISTVALID) == 0)
-    {
-      error ("__dld_list is not valid according to __dld_flags.\n");
-      return 0;
-    }
-
-  /* If the libraries were not mapped private, warn the user.  */
-  if ((dld_flags & DLD_FLAGS_MAPPRIVATE) == 0)
-    warning ("The shared libraries were not privately mapped; setting a\n"
-	     "breakpoint in a shared library will not work until you rerun the "
-	     "program.\n");
+    error (_("__dld_list is not valid according to __dld_flags."));
 
   sym = lookup_minimal_symbol ("__dld_list", NULL, NULL);
   if (!sym)
@@ -561,7 +546,7 @@ link_map_start (void)
       sym = lookup_minimal_symbol ("__dld_flags", NULL, NULL);
       if (!sym)
 	{
-	  error ("Unable to find dynamic library list.\n");
+	  error (_("Unable to find dynamic library list."));
 	  return 0;
 	}
       addr = SYMBOL_VALUE_ADDRESS (sym) - 8;
@@ -570,18 +555,15 @@ link_map_start (void)
     addr = SYMBOL_VALUE_ADDRESS (sym);
 
   read_memory (addr, buf, 4);
-  addr = extract_unsigned_integer (buf, 4);
+  addr = extract_unsigned_integer (buf, 4, byte_order);
   if (addr == 0)
-    {
-      error ("Debugging dynamic executables loaded via the hpux8 dld.sl is not supported.\n");
-      return 0;
-    }
+    return 0;
 
   read_memory (addr, buf, 4);
-  return extract_unsigned_integer (buf, 4);
+  return extract_unsigned_integer (buf, 4, byte_order);
 }
 
-/* Does this so's name match the main binary? */
+/* Does this so's name match the main binary?  */
 static int
 match_main (const char *name)
 {
@@ -591,6 +573,7 @@ match_main (const char *name)
 static struct so_list *
 som_current_sos (void)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   CORE_ADDR lm;
   struct so_list *head = 0;
   struct so_list **link_ptr = &head;
@@ -612,15 +595,14 @@ som_current_sos (void)
       new->lm_info = xmalloc (sizeof (struct lm_info));
       make_cleanup (xfree, new->lm_info);
 
-      read_memory (lm, (char *)&dbuf, sizeof (struct dld_list));
+      read_memory (lm, (gdb_byte *)&dbuf, sizeof (struct dld_list));
 
-      addr = extract_unsigned_integer (&dbuf.name, sizeof (dbuf.name));
+      addr = extract_unsigned_integer ((gdb_byte *)&dbuf.name,
+				       sizeof (dbuf.name), byte_order);
       target_read_string (addr, &namebuf, SO_NAME_MAX_PATH_SIZE - 1, &errcode);
       if (errcode != 0)
-	{
-	  warning ("current_sos: Can't read pathname for load map: %s\n",
-		   safe_strerror (errcode));
-	}
+	warning (_("Can't read pathname for load map: %s."),
+		 safe_strerror (errcode));
       else
 	{
 	  strncpy (new->so_name, namebuf, SO_NAME_MAX_PATH_SIZE - 1);
@@ -637,7 +619,8 @@ som_current_sos (void)
 	    lmi->lm_addr = lm;
 
 #define EXTRACT(_fld) \
-  extract_unsigned_integer (&dbuf._fld, sizeof (dbuf._fld));
+  extract_unsigned_integer ((gdb_byte *)&dbuf._fld, \
+			    sizeof (dbuf._fld), byte_order);
 
 	    lmi->text_addr = EXTRACT (text_addr);
 	    tmp = EXTRACT (info);
@@ -652,33 +635,37 @@ som_current_sos (void)
 	    lmi->got_value = EXTRACT (got_value);
 	    tmp = EXTRACT (tsd_start_addr_ptr);
 	    read_memory (tmp, tsdbuf, 4);
-	    lmi->tsd_start_addr = extract_unsigned_integer (tsdbuf, 4);
+	    lmi->tsd_start_addr
+	      = extract_unsigned_integer (tsdbuf, 4, byte_order);
 
 #ifdef SOLIB_SOM_DBG
-	    printf ("\n+ library \"%s\" is described at 0x%s\n", new->so_name, 
-	    	    paddr_nz (lm));
+	    printf ("\n+ library \"%s\" is described at %s\n", new->so_name,
+	    	    paddress (target_gdbarch, lm));
 	    printf ("  'version' is %d\n", new->lm_info->struct_version);
 	    printf ("  'bind_mode' is %d\n", new->lm_info->bind_mode);
 	    printf ("  'library_version' is %d\n", 
 	    	    new->lm_info->library_version);
-	    printf ("  'text_addr' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->text_addr));
-	    printf ("  'text_link_addr' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->text_link_addr));
-	    printf ("  'text_end' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->text_end));
-	    printf ("  'data_start' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->data_start));
-	    printf ("  'bss_start' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->bss_start));
-	    printf ("  'data_end' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->data_end));
-	    printf ("  'got_value' is %s\n", 
-	    	    paddr_nz (new->lm_info->got_value));
-	    printf ("  'tsd_start_addr' is 0x%s\n", 
-	    	    paddr_nz (new->lm_info->tsd_start_addr));
+	    printf ("  'text_addr' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->text_addr));
+	    printf ("  'text_link_addr' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->text_link_addr));
+	    printf ("  'text_end' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->text_end));
+	    printf ("  'data_start' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->data_start));
+	    printf ("  'bss_start' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->bss_start));
+	    printf ("  'data_end' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->data_end));
+	    printf ("  'got_value' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->got_value));
+	    printf ("  'tsd_start_addr' is %s\n",
+	    	    paddress (target_gdbarch, new->lm_info->tsd_start_addr));
 #endif
 
+	    new->addr_low = lmi->text_addr;
+	    new->addr_high = lmi->text_end;
+
 	    /* Link the new object onto the list.  */
 	    new->next = NULL;
 	    *link_ptr = new;
@@ -703,6 +690,7 @@ som_current_sos (void)
 static int
 som_open_symbol_file_object (void *from_ttyp)
 {
+  enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
   CORE_ADDR lm, l_name;
   char *filename;
   int errcode;
@@ -710,19 +698,19 @@ som_open_symbol_file_object (void *from_ttyp)
   char buf[4];
 
   if (symfile_objfile)
-    if (!query ("Attempt to reload symbols from process? "))
+    if (!query (_("Attempt to reload symbols from process? ")))
       return 0;
 
   /* First link map member should be the executable.  */
   if ((lm = link_map_start ()) == 0)
-    return 0;	/* failed somehow... */
+    return 0;	/* failed somehow...  */
 
   /* Read address of name from target memory to GDB.  */
   read_memory (lm + offsetof (struct dld_list, name), buf, 4);
 
   /* Convert the address to host format.  Assume that the address is
      unsigned.  */
-  l_name = extract_unsigned_integer (buf, 4);
+  l_name = extract_unsigned_integer (buf, 4, byte_order);
 
   if (l_name == 0)
     return 0;		/* No filename.  */
@@ -732,7 +720,7 @@ som_open_symbol_file_object (void *from_ttyp)
 
   if (errcode)
     {
-      warning ("failed to read exec filename from attached file: %s",
+      warning (_("failed to read exec filename from attached file: %s"),
 	       safe_strerror (errcode));
       return 0;
     }
@@ -778,10 +766,11 @@ som_solib_get_got_by_pc (CORE_ADDR addr)
   return got_value;
 }
 
-/* Return the address of the handle of the shared library in which ADDR belongs.
-   If ADDR isn't in any known shared library, return zero.  */
-/* this function is used in initialize_hp_cxx_exception_support in 
-   hppa-hpux-tdep.c  */
+/* Return the address of the handle of the shared library in which
+   ADDR belongs.  If ADDR isn't in any known shared library, return
+   zero.  */
+/* This function is used in initialize_hp_cxx_exception_support in 
+   hppa-hpux-tdep.c.  */
 
 static CORE_ADDR
 som_solib_get_solib_by_pc (CORE_ADDR addr)
@@ -819,19 +808,22 @@ _initialize_som_solib (void)
   som_so_ops.current_sos = som_current_sos;
   som_so_ops.open_symbol_file_object = som_open_symbol_file_object;
   som_so_ops.in_dynsym_resolve_code = som_in_dynsym_resolve_code;
+  som_so_ops.bfd_open = solib_bfd_open;
 }
 
-void som_solib_select (struct gdbarch_tdep *tdep)
+void
+som_solib_select (struct gdbarch *gdbarch)
 {
-  current_target_so_ops = &som_so_ops;
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  set_solib_ops (gdbarch, &som_so_ops);
   tdep->solib_thread_start_addr = som_solib_thread_start_addr;
   tdep->solib_get_got_by_pc = som_solib_get_got_by_pc;
   tdep->solib_get_solib_by_pc = som_solib_get_solib_by_pc;
 }
 
 /* The rest of these functions are not part of the solib interface; they 
-   are used by somread.c or hppa-hpux-tdep.c */
+   are used by somread.c or hppa-hpux-tdep.c.  */
 
 int
 som_solib_section_offsets (struct objfile *objfile,
@@ -860,7 +852,7 @@ som_solib_section_offsets (struct objfile *objfile,
 						     "$PRIVATE$");
 	  if (!private_section)
 	    {
-	      warning ("Unable to find $PRIVATE$ in shared library!");
+	      warning (_("Unable to find $PRIVATE$ in shared library!"));
 	      offsets->offsets[SECT_OFF_DATA (objfile)] = 0;
 	      offsets->offsets[SECT_OFF_BSS (objfile)] = 0;
 	      return 1;