import gdb-1999-07-07 post reformat

1 files changed, 501 insertions, 493 deletions

diff --git a/gdb/solib.c b/gdb/solib.c
index 2bd8a2e..65b35e7 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1,22 +1,23 @@
 /* Handle SunOS and SVR4 shared libraries for GDB, the GNU Debugger.
    Copyright 1990, 91, 92, 93, 94, 95, 96, 98, 1999
    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
-(at your option) any later version.
+   This file is part of GDB.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   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
+   (at your option) any later version.
 
-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.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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.  */
 
 
 #include "defs.h"
@@ -34,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef SVR4_SHARED_LIBS
  /* SunOS shared libs need the nlist structure.  */
-#include <a.out.h> 
+#include <a.out.h>
 #else
 #include "elf/external.h"
 #endif
@@ -55,7 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "language.h"
 #include "gdbcmd.h"
 
-#define MAX_PATH_SIZE 512		/* FIXME: Should be dynamic */
+#define MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
 
 /* On SVR4 systems, a list of symbols in the dynamic linker where
    GDB can try to place a breakpoint to monitor shared library
@@ -66,7 +67,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    mapping complete" breakpoint address.  */
 
 #ifdef SVR4_SHARED_LIBS
-static char *solib_break_names[] = {
+static char *solib_break_names[] =
+{
   "r_debug_state",
   "_r_debug_state",
   "_dl_debug_state",
@@ -78,7 +80,8 @@ static char *solib_break_names[] = {
 #define BKPT_AT_SYMBOL 1
 
 #if defined (BKPT_AT_SYMBOL) && defined (SVR4_SHARED_LIBS)
-static char *bkpt_names[] = {
+static char *bkpt_names[] =
+{
 #ifdef SOLIB_BKPT_NAME
   SOLIB_BKPT_NAME,		/* Prefer configured name if it exists. */
 #endif
@@ -91,14 +94,16 @@ static char *bkpt_names[] = {
 /* Symbols which are used to locate the base of the link map structures. */
 
 #ifndef SVR4_SHARED_LIBS
-static char *debug_base_symbols[] = {
+static char *debug_base_symbols[] =
+{
   "_DYNAMIC",
   "_DYNAMIC__MGC",
   NULL
 };
 #endif
 
-static char *main_name_list[] = {
+static char *main_name_list[] =
+{
   "main_$main",
   NULL
 };
@@ -118,7 +123,7 @@ static struct ld_debug debug_copy;
 static CORE_ADDR debug_addr;
 static CORE_ADDR flag_addr;
 
-#else	/* SVR4_SHARED_LIBS */
+#else /* SVR4_SHARED_LIBS */
 
 #define LM_ADDR(so) ((so) -> lm.l_addr)
 #define LM_NEXT(so) ((so) -> lm.l_next)
@@ -128,31 +133,32 @@ static CORE_ADDR flag_addr;
 static struct r_debug debug_copy;
 char shadow_contents[BREAKPOINT_MAX];	/* Stash old bkpt addr contents */
 
-#endif	/* !SVR4_SHARED_LIBS */
-
-struct so_list {
-  struct so_list *next;			/* next structure in linked list */
-  struct link_map lm;			/* copy of link map from inferior */
-  struct link_map *lmaddr;		/* addr in inferior lm was read from */
-  CORE_ADDR lmend;			/* upper addr bound of mapped object */
-  char so_name[MAX_PATH_SIZE];		/* shared object lib name (FIXME) */
-  char symbols_loaded;			/* flag: symbols read in yet? */
-  char from_tty;			/* flag: print msgs? */
-  struct objfile *objfile;		/* objfile for loaded lib */
-  struct section_table *sections;
-  struct section_table *sections_end;
-  struct section_table *textsection;
-  bfd *abfd;
-};
+#endif /* !SVR4_SHARED_LIBS */
+
+struct so_list
+  {
+    struct so_list *next;	/* next structure in linked list */
+    struct link_map lm;		/* copy of link map from inferior */
+    struct link_map *lmaddr;	/* addr in inferior lm was read from */
+    CORE_ADDR lmend;		/* upper addr bound of mapped object */
+    char so_name[MAX_PATH_SIZE];	/* shared object lib name (FIXME) */
+    char symbols_loaded;	/* flag: symbols read in yet? */
+    char from_tty;		/* flag: print msgs? */
+    struct objfile *objfile;	/* objfile for loaded lib */
+    struct section_table *sections;
+    struct section_table *sections_end;
+    struct section_table *textsection;
+    bfd *abfd;
+  };
 
 static struct so_list *so_list_head;	/* List of known shared objects */
-static CORE_ADDR debug_base;		/* Base of dynamic linker structures */
+static CORE_ADDR debug_base;	/* Base of dynamic linker structures */
 static CORE_ADDR breakpoint_addr;	/* Address where end bkpt is set */
 
-static int solib_cleanup_queued = 0;    /* make_run_cleanup called */
+static int solib_cleanup_queued = 0;	/* make_run_cleanup called */
 
 extern int
-fdmatch PARAMS ((int, int));		/* In libiberty */
+fdmatch PARAMS ((int, int));	/* In libiberty */
 
 /* Local function prototypes */
 
@@ -177,20 +183,20 @@ info_sharedlibrary_command PARAMS ((char *, int));
 static int symbol_add_stub PARAMS ((PTR));
 
 static struct so_list *
-find_solib PARAMS ((struct so_list *));
+  find_solib PARAMS ((struct so_list *));
 
 static struct link_map *
-first_link_map_member PARAMS ((void));
+  first_link_map_member PARAMS ((void));
 
 static CORE_ADDR
-locate_base PARAMS ((void));
+  locate_base PARAMS ((void));
 
 static int solib_map_sections PARAMS ((PTR));
 
 #ifdef SVR4_SHARED_LIBS
 
 static CORE_ADDR
-elf_locate_base PARAMS ((void));
+  elf_locate_base PARAMS ((void));
 
 #else
 
@@ -218,29 +224,29 @@ static char *solib_search_path = NULL;
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	solib_map_sections -- open bfd and build sections for shared lib
+   solib_map_sections -- open bfd and build sections for shared lib
 
-SYNOPSIS
+   SYNOPSIS
 
-	static int solib_map_sections (struct so_list *so)
+   static int solib_map_sections (struct so_list *so)
 
-DESCRIPTION
+   DESCRIPTION
 
-	Given a pointer to one of the shared objects in our list
-	of mapped objects, use the recorded name to open a bfd
-	descriptor for the object, build a section table, and then
-	relocate all the section addresses by the base address at
-	which the shared object was mapped.
+   Given a pointer to one of the shared objects in our list
+   of mapped objects, use the recorded name to open a bfd
+   descriptor for the object, build a section table, and then
+   relocate all the section addresses by the base address at
+   which the shared object was mapped.
 
-FIXMES
+   FIXMES
 
-	In most (all?) cases the shared object file name recorded in the
-	dynamic linkage tables will be a fully qualified pathname.  For
-	cases where it isn't, do we really mimic the systems search
-	mechanism correctly in the below code (particularly the tilde
-	expansion stuff?).
+   In most (all?) cases the shared object file name recorded in the
+   dynamic linkage tables will be a fully qualified pathname.  For
+   cases where it isn't, do we really mimic the systems search
+   mechanism correctly in the below code (particularly the tilde
+   expansion stuff?).
  */
 
 static int
@@ -254,9 +260,9 @@ solib_map_sections (arg)
   struct section_table *p;
   struct cleanup *old_chain;
   bfd *abfd;
-  
-  filename = tilde_expand (so -> so_name);
-  
+
+  filename = tilde_expand (so->so_name);
+
   if (solib_absolute_prefix && ROOTED_P (filename))
     /* Prefix shared libraries with absolute filenames with
        SOLIB_ABSOLUTE_PREFIX.  */
@@ -286,12 +292,12 @@ solib_map_sections (arg)
     scratch_chan = openp (solib_search_path,
 			  1, filename, O_RDONLY, 0, &scratch_pathname);
   if (scratch_chan < 0)
-    scratch_chan = openp (get_in_environ (inferior_environ, "PATH"), 
+    scratch_chan = openp (get_in_environ (inferior_environ, "PATH"),
 			  1, filename, O_RDONLY, 0, &scratch_pathname);
   if (scratch_chan < 0)
     {
-      scratch_chan = openp (get_in_environ 
-			    (inferior_environ, "LD_LIBRARY_PATH"), 
+      scratch_chan = openp (get_in_environ
+			    (inferior_environ, "LD_LIBRARY_PATH"),
 			    1, filename, O_RDONLY, 0, &scratch_pathname);
     }
   if (scratch_chan < 0)
@@ -308,8 +314,8 @@ solib_map_sections (arg)
 	     scratch_pathname, bfd_errmsg (bfd_get_error ()));
     }
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */
-  so -> abfd = abfd;
-  abfd -> cacheable = true;
+  so->abfd = abfd;
+  abfd->cacheable = true;
 
   /* copy full path name into so_name, so that later symbol_file_add can find
      it */
@@ -322,23 +328,23 @@ solib_map_sections (arg)
       error ("\"%s\": not in executable format: %s.",
 	     scratch_pathname, bfd_errmsg (bfd_get_error ()));
     }
-  if (build_section_table (abfd, &so -> sections, &so -> sections_end))
+  if (build_section_table (abfd, &so->sections, &so->sections_end))
     {
-      error ("Can't find the file sections in `%s': %s", 
+      error ("Can't find the file sections in `%s': %s",
 	     bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
     }
 
-  for (p = so -> sections; p < so -> sections_end; p++)
+  for (p = so->sections; p < so->sections_end; p++)
     {
       /* Relocate the section binding addresses as recorded in the shared
-	 object's file by the base address to which the object was actually
-	 mapped. */
-      p -> addr += (CORE_ADDR) LM_ADDR (so);
-      p -> endaddr += (CORE_ADDR) LM_ADDR (so);
-      so -> lmend = (CORE_ADDR) max (p -> endaddr, so -> lmend);
-      if (STREQ (p -> the_bfd_section -> name, ".text"))
+         object's file by the base address to which the object was actually
+         mapped. */
+      p->addr += (CORE_ADDR) LM_ADDR (so);
+      p->endaddr += (CORE_ADDR) LM_ADDR (so);
+      so->lmend = (CORE_ADDR) max (p->endaddr, so->lmend);
+      if (STREQ (p->the_bfd_section->name, ".text"))
 	{
-	  so -> textsection = p;
+	  so->textsection = p;
 	}
     }
 
@@ -360,28 +366,28 @@ allocate_rt_common_objfile ()
 
   objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
   memset (objfile, 0, sizeof (struct objfile));
-  objfile -> md = NULL;
-  obstack_specify_allocation (&objfile -> psymbol_cache.cache, 0, 0,
+  objfile->md = NULL;
+  obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0,
 			      xmalloc, free);
-  obstack_specify_allocation (&objfile -> psymbol_obstack, 0, 0, xmalloc,
+  obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, xmalloc,
 			      free);
-  obstack_specify_allocation (&objfile -> symbol_obstack, 0, 0, xmalloc,
+  obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, xmalloc,
 			      free);
-  obstack_specify_allocation (&objfile -> type_obstack, 0, 0, xmalloc,
+  obstack_specify_allocation (&objfile->type_obstack, 0, 0, xmalloc,
 			      free);
-  objfile -> name = mstrsave (objfile -> md, "rt_common");
+  objfile->name = mstrsave (objfile->md, "rt_common");
 
   /* Add this file onto the tail of the linked list of other such files. */
 
-  objfile -> next = NULL;
+  objfile->next = NULL;
   if (object_files == NULL)
     object_files = objfile;
   else
     {
       for (last_one = object_files;
-	   last_one -> next;
-	   last_one = last_one -> next);
-      last_one -> next = objfile;
+	   last_one->next;
+	   last_one = last_one->next);
+      last_one->next = objfile;
     }
 
   rt_common_objfile = objfile;
@@ -393,7 +399,7 @@ allocate_rt_common_objfile ()
 
 static void
 solib_add_common_symbols (rtc_symp)
-    struct rtc_symb *rtc_symp;
+     struct rtc_symb *rtc_symp;
 {
   struct rtc_symb inferior_rtc_symb;
   struct nlist inferior_rtc_nlist;
@@ -402,13 +408,13 @@ solib_add_common_symbols (rtc_symp)
 
   /* Remove any runtime common symbols from previous runs.  */
 
-  if (rt_common_objfile != NULL && rt_common_objfile -> minimal_symbol_count)
+  if (rt_common_objfile != NULL && rt_common_objfile->minimal_symbol_count)
     {
-      obstack_free (&rt_common_objfile -> symbol_obstack, 0);
-      obstack_specify_allocation (&rt_common_objfile -> symbol_obstack, 0, 0,
+      obstack_free (&rt_common_objfile->symbol_obstack, 0);
+      obstack_specify_allocation (&rt_common_objfile->symbol_obstack, 0, 0,
 				  xmalloc, free);
-      rt_common_objfile -> minimal_symbol_count = 0;
-      rt_common_objfile -> msymbols = NULL;
+      rt_common_objfile->minimal_symbol_count = 0;
+      rt_common_objfile->msymbols = NULL;
     }
 
   init_minimal_symbol_collection ();
@@ -421,7 +427,7 @@ solib_add_common_symbols (rtc_symp)
 		   sizeof (inferior_rtc_symb));
       read_memory ((CORE_ADDR) inferior_rtc_symb.rtc_sp,
 		   (char *) &inferior_rtc_nlist,
-		   sizeof(inferior_rtc_nlist));
+		   sizeof (inferior_rtc_nlist));
       if (inferior_rtc_nlist.n_type == N_COMM)
 	{
 	  /* FIXME: The length of the symbol name is not available, but in the
@@ -449,34 +455,34 @@ solib_add_common_symbols (rtc_symp)
   install_minimal_symbols (rt_common_objfile);
 }
 
-#endif	/* SVR4_SHARED_LIBS */
+#endif /* SVR4_SHARED_LIBS */
 
 
 #ifdef SVR4_SHARED_LIBS
 
 static CORE_ADDR
-bfd_lookup_symbol PARAMS ((bfd *, char *));
+  bfd_lookup_symbol PARAMS ((bfd *, char *));
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	bfd_lookup_symbol -- lookup the value for a specific symbol
+   bfd_lookup_symbol -- lookup the value for a specific symbol
 
-SYNOPSIS
+   SYNOPSIS
 
-	CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname)
+   CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname)
 
-DESCRIPTION
+   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.
+   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).
-*/
+   Note that 0 is specifically allowed as an error return (no
+   such symbol).
+ */
 
 static CORE_ADDR
 bfd_lookup_symbol (abfd, symname)
@@ -490,22 +496,22 @@ bfd_lookup_symbol (abfd, symname)
   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 (free, (PTR)symbol_table);
-      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); 
-  
+      back_to = make_cleanup (free, (PTR) symbol_table);
+      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
+
       for (i = 0; i < number_of_symbols; i++)
 	{
 	  sym = *symbol_table++;
-	  if (STREQ (sym -> name, symname))
+	  if (STREQ (sym->name, symname))
 	    {
 	      /* Bfd symbols are section relative. */
-	      symaddr = sym -> value + sym -> section -> vma;
+	      symaddr = sym->value + sym->section->vma;
 	      break;
 	    }
 	}
@@ -517,25 +523,26 @@ bfd_lookup_symbol (abfd, symname)
 #ifdef HANDLE_SVR4_EXEC_EMULATORS
 
 /*
-	Solaris BCP (the part of Solaris which allows it to run SunOS4
-	a.out files) throws in another wrinkle. Solaris does not fill
-	in the usual a.out link map structures when running BCP programs,
-	the only way to get at them is via groping around in the dynamic
-	linker.
-	The dynamic linker and it's structures are located in the shared
-	C library, which gets run as the executable's "interpreter" by
-	the kernel.
-
-	Note that we can assume nothing about the process state at the time
-	we need to find these structures.  We may be stopped on the first
-	instruction of the interpreter (C shared library), the first
-	instruction of the executable itself, or somewhere else entirely
-	(if we attached to the process for example).
-*/
-
-static char *debug_base_symbols[] = {
-  "r_debug",	/* Solaris 2.3 */
-  "_r_debug",	/* Solaris 2.1, 2.2 */
+   Solaris BCP (the part of Solaris which allows it to run SunOS4
+   a.out files) throws in another wrinkle. Solaris does not fill
+   in the usual a.out link map structures when running BCP programs,
+   the only way to get at them is via groping around in the dynamic
+   linker.
+   The dynamic linker and it's structures are located in the shared
+   C library, which gets run as the executable's "interpreter" by
+   the kernel.
+
+   Note that we can assume nothing about the process state at the time
+   we need to find these structures.  We may be stopped on the first
+   instruction of the interpreter (C shared library), the first
+   instruction of the executable itself, or somewhere else entirely
+   (if we attached to the process for example).
+ */
+
+static char *debug_base_symbols[] =
+{
+  "r_debug",			/* Solaris 2.3 */
+  "_r_debug",			/* Solaris 2.1, 2.2 */
   NULL
 };
 
@@ -544,28 +551,28 @@ look_for_base PARAMS ((int, CORE_ADDR));
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	look_for_base -- examine file for each mapped address segment
+   look_for_base -- examine file for each mapped address segment
 
-SYNOPSYS
+   SYNOPSYS
 
-	static int look_for_base (int fd, CORE_ADDR baseaddr)
+   static int look_for_base (int fd, CORE_ADDR baseaddr)
 
-DESCRIPTION
+   DESCRIPTION
 
-	This function is passed to proc_iterate_over_mappings, which
-	causes it to get called once for each mapped address space, with
-	an open file descriptor for the file mapped to that space, and the
-	base address of that mapped space.
+   This function is passed to proc_iterate_over_mappings, which
+   causes it to get called once for each mapped address space, with
+   an open file descriptor for the file mapped to that space, and the
+   base address of that mapped space.
 
-	Our job is to find the debug base symbol in the file that this
-	fd is open on, if it exists, and if so, initialize the dynamic
-	linker structure base address debug_base.
+   Our job is to find the debug base symbol in the file that this
+   fd is open on, if it exists, and if so, initialize the dynamic
+   linker structure base address debug_base.
 
-	Note that this is a computationally expensive proposition, since
-	we basically have to open a bfd on every call, so we specifically
-	avoid opening the exec file.
+   Note that this is a computationally expensive proposition, since
+   we basically have to open a bfd on every call, so we specifically
+   avoid opening the exec file.
  */
 
 static int
@@ -583,7 +590,7 @@ look_for_base (fd, baseaddr)
 
   if (fd == -1
       || (exec_bfd != NULL
-	  && fdmatch (fileno ((FILE *)(exec_bfd -> iostream)), fd)))
+	  && fdmatch (fileno ((FILE *) (exec_bfd->iostream)), fd)))
     {
       return (0);
     }
@@ -599,7 +606,7 @@ look_for_base (fd, baseaddr)
   if (!bfd_check_format (interp_bfd, bfd_object))
     {
       /* FIXME-leak: on failure, might not free all memory associated with
-	 interp_bfd.  */
+         interp_bfd.  */
       bfd_close (interp_bfd);
       return (0);
     }
@@ -618,7 +625,7 @@ look_for_base (fd, baseaddr)
   if (address == 0)
     {
       /* FIXME-leak: on failure, might not free all memory associated with
-	 interp_bfd.  */
+         interp_bfd.  */
       bfd_close (interp_bfd);
       return (0);
     }
@@ -645,25 +652,25 @@ look_for_base (fd, baseaddr)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	elf_locate_base -- locate the base address of dynamic linker structs
-	for SVR4 elf targets.
+   elf_locate_base -- locate the base address of dynamic linker structs
+   for SVR4 elf targets.
 
-SYNOPSIS
+   SYNOPSIS
 
-	CORE_ADDR elf_locate_base (void)
+   CORE_ADDR elf_locate_base (void)
 
-DESCRIPTION
+   DESCRIPTION
 
-	For SVR4 elf targets the address of the dynamic linker's runtime
-	structure is contained within the dynamic info section in the
-	executable file.  The dynamic section is also mapped into the
-	inferior address space.  Because the runtime loader fills in the
-	real address before starting the inferior, we have to read in the
-	dynamic info section from the inferior address space.
-	If there are any errors while trying to find the address, we
-	silently return 0, otherwise the found address is returned.
+   For SVR4 elf targets the address of the dynamic linker's runtime
+   structure is contained within the dynamic info section in the
+   executable file.  The dynamic section is also mapped into the
+   inferior address space.  Because the runtime loader fills in the
+   real address before starting the inferior, we have to read in the
+   dynamic info section from the inferior address space.
+   If there are any errors while trying to find the address, we
+   silently return 0, otherwise the found address is returned.
 
  */
 
@@ -696,7 +703,7 @@ elf_locate_base ()
        buf < bufend;
        buf += sizeof (Elf32_External_Dyn))
     {
-      Elf32_External_Dyn *x_dynp = (Elf32_External_Dyn *)buf;
+      Elf32_External_Dyn *x_dynp = (Elf32_External_Dyn *) buf;
       long dyn_tag;
       CORE_ADDR dyn_ptr;
 
@@ -727,7 +734,7 @@ elf_locate_base ()
        buf < bufend;
        buf += sizeof (Elf64_External_Dyn))
     {
-      Elf64_External_Dyn *x_dynp = (Elf64_External_Dyn *)buf;
+      Elf64_External_Dyn *x_dynp = (Elf64_External_Dyn *) buf;
       long dyn_tag;
       CORE_ADDR dyn_ptr;
 
@@ -746,42 +753,42 @@ elf_locate_base ()
   return 0;
 }
 
-#endif	/* SVR4_SHARED_LIBS */
+#endif /* SVR4_SHARED_LIBS */
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	locate_base -- locate the base address of dynamic linker structs
+   locate_base -- locate the base address of dynamic linker structs
 
-SYNOPSIS
+   SYNOPSIS
 
-	CORE_ADDR locate_base (void)
+   CORE_ADDR locate_base (void)
 
-DESCRIPTION
+   DESCRIPTION
 
-	For both the SunOS and SVR4 shared library implementations, if the
-	inferior executable has been linked dynamically, there is a single
-	address somewhere in the inferior's data space which is the key to
-	locating all of the dynamic linker's runtime structures.  This
-	address is the value of the debug base symbol.  The job of this
-	function is to find and return that address, or to return 0 if there
-	is no such address (the executable is statically linked for example).
+   For both the SunOS and SVR4 shared library implementations, if the
+   inferior executable has been linked dynamically, there is a single
+   address somewhere in the inferior's data space which is the key to
+   locating all of the dynamic linker's runtime structures.  This
+   address is the value of the debug base symbol.  The job of this
+   function is to find and return that address, or to return 0 if there
+   is no such address (the executable is statically linked for example).
 
-	For SunOS, the job is almost trivial, since the dynamic linker and
-	all of it's structures are statically linked to the executable at
-	link time.  Thus the symbol for the address we are looking for has
-	already been added to the minimal symbol table for the executable's
-	objfile at the time the symbol file's symbols were read, and all we
-	have to do is look it up there.  Note that we explicitly do NOT want
-	to find the copies in the shared library.
+   For SunOS, the job is almost trivial, since the dynamic linker and
+   all of it's structures are statically linked to the executable at
+   link time.  Thus the symbol for the address we are looking for has
+   already been added to the minimal symbol table for the executable's
+   objfile at the time the symbol file's symbols were read, and all we
+   have to do is look it up there.  Note that we explicitly do NOT want
+   to find the copies in the shared library.
 
-	The SVR4 version is a bit more complicated because the address
-	is contained somewhere in the dynamic info section.  We have to go
-	to a lot more work to discover the address of the debug base symbol.
-	Because of this complexity, we cache the value we find and return that
-	value on subsequent invocations.  Note there is no copy in the
-	executable symbol tables.
+   The SVR4 version is a bit more complicated because the address
+   is contained somewhere in the dynamic info section.  We have to go
+   to a lot more work to discover the address of the debug base symbol.
+   Because of this complexity, we cache the value we find and return that
+   value on subsequent invocations.  Note there is no copy in the
+   executable symbol tables.
 
  */
 
@@ -810,7 +817,7 @@ locate_base ()
     }
   return (0);
 
-#else	/* SVR4_SHARED_LIBS */
+#else /* SVR4_SHARED_LIBS */
 
   /* Check to see if we have a currently valid address, and if so, avoid
      doing all this work again and just return the cached address.  If
@@ -830,26 +837,26 @@ locate_base ()
     }
   return (debug_base);
 
-#endif	/* !SVR4_SHARED_LIBS */
+#endif /* !SVR4_SHARED_LIBS */
 
 }
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	first_link_map_member -- locate first member in dynamic linker's map
+   first_link_map_member -- locate first member in dynamic linker's map
 
-SYNOPSIS
+   SYNOPSIS
 
-	static struct link_map *first_link_map_member (void)
+   static struct link_map *first_link_map_member (void)
 
-DESCRIPTION
+   DESCRIPTION
 
-	Read in a copy of the first member in the inferior's dynamic
-	link map from the inferior's dynamic linker structures, and return
-	a pointer to the copy in our address space.
-*/
+   Read in a copy of the first member in the inferior's dynamic
+   link map from the inferior's dynamic linker structures, and return
+   a pointer to the copy in our address space.
+ */
 
 static struct link_map *
 first_link_map_member ()
@@ -862,13 +869,13 @@ first_link_map_member ()
   if (dynamic_copy.ld_version >= 2)
     {
       /* It is a version that we can deal with, so read in the secondary
-	 structure and find the address of the link map list from it. */
+         structure and find the address of the link map list from it. */
       read_memory ((CORE_ADDR) dynamic_copy.ld_un.ld_2, (char *) &ld_2_copy,
 		   sizeof (struct link_dynamic_2));
       lm = ld_2_copy.ld_loaded;
     }
 
-#else	/* SVR4_SHARED_LIBS */
+#else /* SVR4_SHARED_LIBS */
 
   read_memory (debug_base, (char *) &debug_copy, sizeof (struct r_debug));
   /* FIXME:  Perhaps we should validate the info somehow, perhaps by
@@ -876,32 +883,32 @@ first_link_map_member ()
      RT_CONSISTENT. */
   lm = debug_copy.r_map;
 
-#endif	/* !SVR4_SHARED_LIBS */
+#endif /* !SVR4_SHARED_LIBS */
 
   return (lm);
 }
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	find_solib -- step through list of shared objects
+   find_solib -- step through list of shared objects
 
-SYNOPSIS
+   SYNOPSIS
 
-	struct so_list *find_solib (struct so_list *so_list_ptr)
+   struct so_list *find_solib (struct so_list *so_list_ptr)
 
-DESCRIPTION
+   DESCRIPTION
 
-	This module contains the routine which finds the names of any
-	loaded "images" in the current process. The argument in must be
-	NULL on the first call, and then the returned value must be passed
-	in on subsequent calls. This provides the capability to "step" down
-	the list of loaded objects. On the last object, a NULL value is
-	returned.
+   This module contains the routine which finds the names of any
+   loaded "images" in the current process. The argument in must be
+   NULL on the first call, and then the returned value must be passed
+   in on subsequent calls. This provides the capability to "step" down
+   the list of loaded objects. On the last object, a NULL value is
+   returned.
 
-	The arg and return value are "struct link_map" pointers, as defined
-	in <link.h>.
+   The arg and return value are "struct link_map" pointers, as defined
+   in <link.h>.
  */
 
 static struct so_list *
@@ -911,7 +918,7 @@ find_solib (so_list_ptr)
   struct so_list *so_list_next = NULL;
   struct link_map *lm = NULL;
   struct so_list *new;
-  
+
   if (so_list_ptr == NULL)
     {
       /* We are setting up for a new scan through the loaded images. */
@@ -923,7 +930,7 @@ find_solib (so_list_ptr)
 	  if (debug_base != 0)
 	    {
 	      /* Read the base structure in and find the address of the first
-		 link map list member. */
+	         link map list member. */
 	      lm = first_link_map_member ();
 	    }
 	}
@@ -931,13 +938,13 @@ find_solib (so_list_ptr)
   else
     {
       /* We have been called before, and are in the process of walking
-	 the shared library list.  Advance to the next shared object. */
+         the shared library list.  Advance to the next shared object. */
       if ((lm = LM_NEXT (so_list_ptr)) == NULL)
 	{
 	  /* We have hit the end of the list, so check to see if any were
 	     added, but be quiet if we can't read from the target any more. */
-	  int status = target_read_memory ((CORE_ADDR) so_list_ptr -> lmaddr,
-					   (char *) &(so_list_ptr -> lm),
+	  int status = target_read_memory ((CORE_ADDR) so_list_ptr->lmaddr,
+					   (char *) &(so_list_ptr->lm),
 					   sizeof (struct link_map));
 	  if (status == 0)
 	    {
@@ -948,41 +955,41 @@ find_solib (so_list_ptr)
 	      lm = NULL;
 	    }
 	}
-      so_list_next = so_list_ptr -> next;
+      so_list_next = so_list_ptr->next;
     }
   if ((so_list_next == NULL) && (lm != NULL))
     {
       /* Get next link map structure from inferior image and build a local
-	 abbreviated load_map structure */
+         abbreviated load_map structure */
       new = (struct so_list *) xmalloc (sizeof (struct so_list));
       memset ((char *) new, 0, sizeof (struct so_list));
-      new -> lmaddr = lm;
+      new->lmaddr = lm;
       /* Add the new node as the next node in the list, or as the root
-	 node if this is the first one. */
+         node if this is the first one. */
       if (so_list_ptr != NULL)
 	{
-	  so_list_ptr -> next = new;
+	  so_list_ptr->next = new;
 	}
       else
 	{
 	  so_list_head = new;
 
-	  if (! solib_cleanup_queued)
+	  if (!solib_cleanup_queued)
 	    {
 	      make_run_cleanup (do_clear_solib, NULL);
 	      solib_cleanup_queued = 1;
 	    }
-	  
-	}      
+
+	}
       so_list_next = new;
-      read_memory ((CORE_ADDR) lm, (char *) &(new -> lm),
+      read_memory ((CORE_ADDR) lm, (char *) &(new->lm),
 		   sizeof (struct link_map));
       /* For SVR4 versions, the first entry in the link map is for the
-	 inferior executable, so we must ignore it.  For some versions of
-	 SVR4, it has no name.  For others (Solaris 2.3 for example), it
-	 does have a name, so we can no longer use a missing name to
-	 decide when to ignore it. */
-      if (!IGNORE_FIRST_LINK_MAP_ENTRY (new -> lm))
+         inferior executable, so we must ignore it.  For some versions of
+         SVR4, it has no name.  For others (Solaris 2.3 for example), it
+         does have a name, so we can no longer use a missing name to
+         decide when to ignore it. */
+      if (!IGNORE_FIRST_LINK_MAP_ENTRY (new->lm))
 	{
 	  int errcode;
 	  char *buffer;
@@ -994,13 +1001,13 @@ find_solib (so_list_ptr)
 		       safe_strerror (errcode));
 	      return (so_list_next);
 	    }
-	  strncpy (new -> so_name, buffer, MAX_PATH_SIZE - 1);
-	  new -> so_name[MAX_PATH_SIZE - 1] = '\0';
+	  strncpy (new->so_name, buffer, MAX_PATH_SIZE - 1);
+	  new->so_name[MAX_PATH_SIZE - 1] = '\0';
 	  free (buffer);
 	  catch_errors (solib_map_sections, new,
 			"Error while mapping shared library sections:\n",
 			RETURN_MASK_ALL);
-	}      
+	}
     }
   return (so_list_next);
 }
@@ -1011,34 +1018,34 @@ static int
 symbol_add_stub (arg)
      PTR arg;
 {
-  register struct so_list *so = (struct so_list *) arg;	/* catch_errs bogon */
+  register struct so_list *so = (struct so_list *) arg;		/* catch_errs bogon */
   CORE_ADDR text_addr = 0;
 
-  if (so -> textsection)
-    text_addr = so -> textsection -> addr;
-  else if (so -> abfd != NULL)
+  if (so->textsection)
+    text_addr = so->textsection->addr;
+  else if (so->abfd != NULL)
     {
       asection *lowest_sect;
 
       /* If we didn't find a mapped non zero sized .text section, set up
-	 text_addr so that the relocation in symbol_file_add does no harm.  */
+         text_addr so that the relocation in symbol_file_add does no harm.  */
 
-      lowest_sect = bfd_get_section_by_name (so -> abfd, ".text");
+      lowest_sect = bfd_get_section_by_name (so->abfd, ".text");
       if (lowest_sect == NULL)
-	bfd_map_over_sections (so -> abfd, find_lowest_section,
-			       (PTR) &lowest_sect);
+	bfd_map_over_sections (so->abfd, find_lowest_section,
+			       (PTR) & lowest_sect);
       if (lowest_sect)
-	text_addr = bfd_section_vma (so -> abfd, lowest_sect)
-		    + (CORE_ADDR) LM_ADDR (so);
-    }
-  
-  ALL_OBJFILES (so -> objfile)
-    {
-      if (strcmp (so -> objfile -> name, so -> so_name) == 0)
-	return 1;
+	text_addr = bfd_section_vma (so->abfd, lowest_sect)
+	  + (CORE_ADDR) LM_ADDR (so);
     }
-  so -> objfile =
-    symbol_file_add (so -> so_name, so -> from_tty,
+
+  ALL_OBJFILES (so->objfile)
+  {
+    if (strcmp (so->objfile->name, so->so_name) == 0)
+      return 1;
+  }
+  so->objfile =
+    symbol_file_add (so->so_name, so->from_tty,
 		     text_addr,
 		     0, 0, 0, 0, 1);
   return (1);
@@ -1047,8 +1054,9 @@ symbol_add_stub (arg)
 /* This function will check the so name to see if matches the main list.
    In some system the main object is in the list, which we want to exclude */
 
-static int match_main (soname)
-    char *soname;
+static int
+match_main (soname)
+     char *soname;
 {
   char **mainp;
 
@@ -1063,26 +1071,26 @@ static int match_main (soname)
 
 /*
 
-GLOBAL FUNCTION
+   GLOBAL FUNCTION
 
-	solib_add -- add a shared library file to the symtab and section list
+   solib_add -- add a shared library file to the symtab and section list
 
-SYNOPSIS
+   SYNOPSIS
 
-	void solib_add (char *arg_string, int from_tty,
-			struct target_ops *target)
+   void solib_add (char *arg_string, int from_tty,
+   struct target_ops *target)
 
-DESCRIPTION
+   DESCRIPTION
 
-*/
+ */
 
 void
 solib_add (arg_string, from_tty, target)
      char *arg_string;
      int from_tty;
      struct target_ops *target;
-{	
-  register struct so_list *so = NULL;   	/* link map state variable */
+{
+  register struct so_list *so = NULL;	/* link map state variable */
 
   /* Last shared library that we read.  */
   struct so_list *so_last = NULL;
@@ -1090,12 +1098,12 @@ solib_add (arg_string, from_tty, target)
   char *re_err;
   int count;
   int old;
-  
+
   if ((re_err = re_comp (arg_string ? arg_string : ".")) != NULL)
     {
       error ("Invalid regexp: %s", re_err);
     }
-  
+
   /* Add the shared library sections to the section table of the
      specified target, if any.  */
   if (target)
@@ -1105,12 +1113,12 @@ solib_add (arg_string, from_tty, target)
       count = 0;
       while ((so = find_solib (so)) != NULL)
 	{
-	  if (so -> so_name[0] && !match_main (so -> so_name))
+	  if (so->so_name[0] && !match_main (so->so_name))
 	    {
-	      count += so -> sections_end - so -> sections;
+	      count += so->sections_end - so->sections;
 	    }
 	}
-      
+
       if (count)
 	{
 	  int update_coreops;
@@ -1119,23 +1127,23 @@ solib_add (arg_string, from_tty, target)
 	     here, otherwise we dereference a potential dangling pointer
 	     for each call to target_read/write_memory within this routine.  */
 	  update_coreops = core_ops.to_sections == target->to_sections;
-          	     
+
 	  /* Reallocate the target's section table including the new size.  */
-	  if (target -> to_sections)
+	  if (target->to_sections)
 	    {
-	      old = target -> to_sections_end - target -> to_sections;
-	      target -> to_sections = (struct section_table *)
-		xrealloc ((char *)target -> to_sections,
-			 (sizeof (struct section_table)) * (count + old));
+	      old = target->to_sections_end - target->to_sections;
+	      target->to_sections = (struct section_table *)
+		xrealloc ((char *) target->to_sections,
+			  (sizeof (struct section_table)) * (count + old));
 	    }
 	  else
 	    {
 	      old = 0;
-	      target -> to_sections = (struct section_table *)
+	      target->to_sections = (struct section_table *)
 		xmalloc ((sizeof (struct section_table)) * count);
 	    }
-	  target -> to_sections_end = target -> to_sections + (count + old);
-	  
+	  target->to_sections_end = target->to_sections + (count + old);
+
 	  /* Update the to_sections field in the core_ops structure
 	     if needed.  */
 	  if (update_coreops)
@@ -1147,30 +1155,30 @@ solib_add (arg_string, from_tty, target)
 	  /* Add these section table entries to the target's table.  */
 	  while ((so = find_solib (so)) != NULL)
 	    {
-	      if (so -> so_name[0])
+	      if (so->so_name[0])
 		{
-		  count = so -> sections_end - so -> sections;
-		  memcpy ((char *) (target -> to_sections + old),
-			  so -> sections, 
+		  count = so->sections_end - so->sections;
+		  memcpy ((char *) (target->to_sections + old),
+			  so->sections,
 			  (sizeof (struct section_table)) * count);
 		  old += count;
 		}
 	    }
 	}
     }
-  
+
   /* Now add the symbol files.  */
   while ((so = find_solib (so)) != NULL)
     {
-      if (so -> so_name[0] && re_exec (so -> so_name) && 
-      !match_main (so -> so_name))
+      if (so->so_name[0] && re_exec (so->so_name) &&
+	  !match_main (so->so_name))
 	{
-	  so -> from_tty = from_tty;
-	  if (so -> symbols_loaded)
+	  so->from_tty = from_tty;
+	  if (so->symbols_loaded)
 	    {
 	      if (from_tty)
 		{
-		  printf_unfiltered ("Symbols already loaded for %s\n", so -> so_name);
+		  printf_unfiltered ("Symbols already loaded for %s\n", so->so_name);
 		}
 	    }
 	  else if (catch_errors
@@ -1179,7 +1187,7 @@ solib_add (arg_string, from_tty, target)
 		    RETURN_MASK_ALL))
 	    {
 	      so_last = so;
-	      so -> symbols_loaded = 1;
+	      so->symbols_loaded = 1;
 	    }
 	}
     }
@@ -1195,26 +1203,26 @@ solib_add (arg_string, from_tty, target)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	info_sharedlibrary_command -- code for "info sharedlibrary"
+   info_sharedlibrary_command -- code for "info sharedlibrary"
 
-SYNOPSIS
+   SYNOPSIS
 
-	static void info_sharedlibrary_command ()
+   static void info_sharedlibrary_command ()
 
-DESCRIPTION
+   DESCRIPTION
 
-	Walk through the shared library list and print information
-	about each attached library.
-*/
+   Walk through the shared library list and print information
+   about each attached library.
+ */
 
 static void
 info_sharedlibrary_command (ignore, from_tty)
      char *ignore;
      int from_tty;
 {
-  register struct so_list *so = NULL;  	/* link map state variable */
+  register struct so_list *so = NULL;	/* link map state variable */
   int header_done = 0;
   int addr_width;
   char *addr_fmt;
@@ -1226,77 +1234,77 @@ info_sharedlibrary_command (ignore, from_tty)
     }
 
 #ifndef TARGET_ELF64
-  addr_width = 8+4;
+  addr_width = 8 + 4;
   addr_fmt = "08l";
 #else
-  addr_width = 16+4;
+  addr_width = 16 + 4;
   addr_fmt = "016l";
 #endif
 
   while ((so = find_solib (so)) != NULL)
     {
-      if (so -> so_name[0])
+      if (so->so_name[0])
 	{
 	  if (!header_done)
 	    {
-	      printf_unfiltered("%-*s%-*s%-12s%s\n", addr_width, "From",
-				addr_width, "To", "Syms Read",
-				"Shared Object Library");
+	      printf_unfiltered ("%-*s%-*s%-12s%s\n", addr_width, "From",
+				 addr_width, "To", "Syms Read",
+				 "Shared Object Library");
 	      header_done++;
 	    }
 
 	  printf_unfiltered ("%-*s", addr_width,
-		  local_hex_string_custom ((unsigned long) LM_ADDR (so),
-					   addr_fmt));
+		      local_hex_string_custom ((unsigned long) LM_ADDR (so),
+					       addr_fmt));
 	  printf_unfiltered ("%-*s", addr_width,
-		  local_hex_string_custom ((unsigned long) so -> lmend,
-					   addr_fmt));
-	  printf_unfiltered ("%-12s", so -> symbols_loaded ? "Yes" : "No");
-	  printf_unfiltered ("%s\n",  so -> so_name);
+			 local_hex_string_custom ((unsigned long) so->lmend,
+						  addr_fmt));
+	  printf_unfiltered ("%-12s", so->symbols_loaded ? "Yes" : "No");
+	  printf_unfiltered ("%s\n", so->so_name);
 	}
     }
   if (so_list_head == NULL)
     {
-      printf_unfiltered ("No shared libraries loaded at this time.\n");	
+      printf_unfiltered ("No shared libraries loaded at this time.\n");
     }
 }
 
 /*
 
-GLOBAL FUNCTION
+   GLOBAL FUNCTION
 
-	solib_address -- check to see if an address is in a shared lib
+   solib_address -- check to see if an address is in a shared lib
 
-SYNOPSIS
+   SYNOPSIS
 
-	char * solib_address (CORE_ADDR address)
+   char * solib_address (CORE_ADDR address)
 
-DESCRIPTION
+   DESCRIPTION
 
-	Provides a hook for other gdb routines to discover whether or
-	not a particular address is within the mapped address space of
-	a shared library.  Any address between the base mapping address
-	and the first address beyond the end of the last mapping, is
-	considered to be within the shared library address space, for
-	our purposes.
+   Provides a hook for other gdb routines to discover whether or
+   not a particular address is within the mapped address space of
+   a shared library.  Any address between the base mapping address
+   and the first address beyond the end of the last mapping, is
+   considered to be within the shared library address space, for
+   our purposes.
 
-	For example, this routine is called at one point to disable
-	breakpoints which are in shared libraries that are not currently
-	mapped in.
+   For example, this routine is called at one point to disable
+   breakpoints which are in shared libraries that are not currently
+   mapped in.
  */
 
 char *
 solib_address (address)
      CORE_ADDR address;
 {
-  register struct so_list *so = 0;   	/* link map state variable */
-  
+  register struct so_list *so = 0;	/* link map state variable */
+
   while ((so = find_solib (so)) != NULL)
     {
-      if (so -> so_name[0])
+      if (so->so_name[0])
 	{
 	  if ((address >= (CORE_ADDR) LM_ADDR (so)) &&
-	      (address < (CORE_ADDR) so -> lmend))
+	      (address < (CORE_ADDR) so->lmend))
 	    return (so->so_name);
 	}
     }
@@ -1305,7 +1313,7 @@ solib_address (address)
 
 /* Called by free_all_symtabs */
 
-void 
+void
 clear_solib ()
 {
   struct so_list *next;
@@ -1337,14 +1345,14 @@ clear_solib ()
 
   while (so_list_head)
     {
-      if (so_list_head -> sections)
+      if (so_list_head->sections)
 	{
-	  free ((PTR)so_list_head -> sections);
+	  free ((PTR) so_list_head->sections);
 	}
-      if (so_list_head -> abfd)
+      if (so_list_head->abfd)
 	{
-	  bfd_filename = bfd_get_filename (so_list_head -> abfd);
-	  if (!bfd_close (so_list_head -> abfd))
+	  bfd_filename = bfd_get_filename (so_list_head->abfd);
+	  if (!bfd_close (so_list_head->abfd))
 	    warning ("cannot close \"%s\": %s",
 		     bfd_filename, bfd_errmsg (bfd_get_error ()));
 	}
@@ -1352,10 +1360,10 @@ clear_solib ()
 	/* This happens for the executable on SVR4.  */
 	bfd_filename = NULL;
 
-      next = so_list_head -> next;
+      next = so_list_head->next;
       if (bfd_filename)
-	free ((PTR)bfd_filename);
-      free ((PTR)so_list_head);
+	free ((PTR) bfd_filename);
+      free ((PTR) so_list_head);
       so_list_head = next;
     }
   debug_base = 0;
@@ -1391,20 +1399,20 @@ in_svr4_dynsym_resolve_code (pc)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	disable_break -- remove the "mapping changed" breakpoint
+   disable_break -- remove the "mapping changed" breakpoint
 
-SYNOPSIS
+   SYNOPSIS
 
-	static int disable_break ()
+   static int disable_break ()
 
-DESCRIPTION
+   DESCRIPTION
 
-	Removes the breakpoint that gets hit when the dynamic linker
-	completes a mapping change.
+   Removes the breakpoint that gets hit when the dynamic linker
+   completes a mapping change.
 
-*/
+ */
 
 #ifndef SVR4_SHARED_LIBS
 
@@ -1416,7 +1424,7 @@ disable_break ()
 #ifndef SVR4_SHARED_LIBS
 
   int in_debugger = 0;
-  
+
   /* Read the debugger structure from the inferior to retrieve the
      address of the breakpoint and the original contents of the
      breakpoint address.  Remove the breakpoint by writing the original
@@ -1432,7 +1440,7 @@ disable_break ()
   write_memory (breakpoint_addr, (char *) &debug_copy.ldd_bp_inst,
 		sizeof (debug_copy.ldd_bp_inst));
 
-#else	/* SVR4_SHARED_LIBS */
+#else /* SVR4_SHARED_LIBS */
 
   /* Note that breakpoint address and original contents are in our address
      space, so we just need to write the original contents back. */
@@ -1442,7 +1450,7 @@ disable_break ()
       status = 0;
     }
 
-#endif	/* !SVR4_SHARED_LIBS */
+#endif /* !SVR4_SHARED_LIBS */
 
   /* For the SVR4 version, we always know the breakpoint address.  For the
      SunOS version we don't know it until the above code is executed.
@@ -1456,50 +1464,50 @@ disable_break ()
   return (status);
 }
 
-#endif	/* #ifdef SVR4_SHARED_LIBS */
+#endif /* #ifdef SVR4_SHARED_LIBS */
 
 /*
 
-LOCAL FUNCTION
-
-	enable_break -- arrange for dynamic linker to hit breakpoint
-
-SYNOPSIS
-
-	int enable_break (void)
-
-DESCRIPTION
-
-	Both the SunOS and the SVR4 dynamic linkers have, as part of their
-	debugger interface, support for arranging for the inferior to hit
-	a breakpoint after mapping in the shared libraries.  This function
-	enables that breakpoint.
-
-	For SunOS, there is a special flag location (in_debugger) which we
-	set to 1.  When the dynamic linker sees this flag set, it will set
-	a breakpoint at a location known only to itself, after saving the
-	original contents of that place and the breakpoint address itself,
-	in it's own internal structures.  When we resume the inferior, it
-	will eventually take a SIGTRAP when it runs into the breakpoint.
-	We handle this (in a different place) by restoring the contents of
-	the breakpointed location (which is only known after it stops),
-	chasing around to locate the shared libraries that have been
-	loaded, then resuming.
-
-	For SVR4, the debugger interface structure contains a member (r_brk)
-	which is statically initialized at the time the shared library is
-	built, to the offset of a function (_r_debug_state) which is guaran-
-	teed to be called once before mapping in a library, and again when
-	the mapping is complete.  At the time we are examining this member,
-	it contains only the unrelocated offset of the function, so we have
-	to do our own relocation.  Later, when the dynamic linker actually
-	runs, it relocates r_brk to be the actual address of _r_debug_state().
-
-	The debugger interface structure also contains an enumeration which
-	is set to either RT_ADD or RT_DELETE prior to changing the mapping,
-	depending upon whether or not the library is being mapped or unmapped,
-	and then set to RT_CONSISTENT after the library is mapped/unmapped.
-*/
+   LOCAL FUNCTION
+
+   enable_break -- arrange for dynamic linker to hit breakpoint
+
+   SYNOPSIS
+
+   int enable_break (void)
+
+   DESCRIPTION
+
+   Both the SunOS and the SVR4 dynamic linkers have, as part of their
+   debugger interface, support for arranging for the inferior to hit
+   a breakpoint after mapping in the shared libraries.  This function
+   enables that breakpoint.
+
+   For SunOS, there is a special flag location (in_debugger) which we
+   set to 1.  When the dynamic linker sees this flag set, it will set
+   a breakpoint at a location known only to itself, after saving the
+   original contents of that place and the breakpoint address itself,
+   in it's own internal structures.  When we resume the inferior, it
+   will eventually take a SIGTRAP when it runs into the breakpoint.
+   We handle this (in a different place) by restoring the contents of
+   the breakpointed location (which is only known after it stops),
+   chasing around to locate the shared libraries that have been
+   loaded, then resuming.
+
+   For SVR4, the debugger interface structure contains a member (r_brk)
+   which is statically initialized at the time the shared library is
+   built, to the offset of a function (_r_debug_state) which is guaran-
+   teed to be called once before mapping in a library, and again when
+   the mapping is complete.  At the time we are examining this member,
+   it contains only the unrelocated offset of the function, so we have
+   to do our own relocation.  Later, when the dynamic linker actually
+   runs, it relocates r_brk to be the actual address of _r_debug_state().
+
+   The debugger interface structure also contains an enumeration which
+   is set to either RT_ADD or RT_DELETE prior to changing the mapping,
+   depending upon whether or not the library is being mapped or unmapped,
+   and then set to RT_CONSISTENT after the library is mapped/unmapped.
+ */
 
 static int
 enable_break ()
@@ -1536,7 +1544,7 @@ enable_break ()
   write_memory (flag_addr, (char *) &in_debugger, sizeof (in_debugger));
   success = 1;
 
-#else	/* SVR4_SHARED_LIBS */
+#else /* SVR4_SHARED_LIBS */
 
 #ifdef BKPT_AT_SYMBOL
 
@@ -1564,20 +1572,20 @@ enable_break ()
       CORE_ADDR sym_addr = 0;
 
       /* Read the contents of the .interp section into a local buffer;
-	 the contents specify the dynamic linker this program uses.  */
+         the contents specify the dynamic linker this program uses.  */
       interp_sect_size = bfd_section_size (exec_bfd, interp_sect);
       buf = alloca (interp_sect_size);
       bfd_get_section_contents (exec_bfd, interp_sect,
 				buf, 0, interp_sect_size);
 
       /* Now we need to figure out where the dynamic linker was
-	 loaded so that we can load its symbols and place a breakpoint
-	 in the dynamic linker itself.
+         loaded so that we can load its symbols and place a breakpoint
+         in the dynamic linker itself.
 
-	 This address is stored on the stack.  However, I've been unable
-	 to find any magic formula to find it for Solaris (appears to
-	 be trivial on GNU/Linux).  Therefore, we have to try an alternate
-	 mechanism to find the dynamic linker's base address.  */
+         This address is stored on the stack.  However, I've been unable
+         to find any magic formula to find it for Solaris (appears to
+         be trivial on GNU/Linux).  Therefore, we have to try an alternate
+         mechanism to find the dynamic linker's base address.  */
       tmp_bfd = bfd_openr (buf, gnutarget);
       if (tmp_bfd == NULL)
 	goto bkpt_at_symbol;
@@ -1591,12 +1599,12 @@ enable_break ()
 	}
 
       /* We find the dynamic linker's base address by examining the
-	 current pc (which point at the entry point for the dynamic
-	 linker) and subtracting the offset of the entry point.  */
+         current pc (which point at the entry point for the dynamic
+         linker) and subtracting the offset of the entry point.  */
       load_addr = read_pc () - tmp_bfd->start_address;
 
       /* Record the relocated start and end address of the dynamic linker
-	 text and plt section for in_svr4_dynsym_resolve_code.  */
+         text and plt section for in_svr4_dynsym_resolve_code.  */
       interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
       if (interp_sect)
 	{
@@ -1632,8 +1640,8 @@ enable_break ()
 	}
 
       /* For whatever reason we couldn't set a breakpoint in the dynamic
-	 linker.  Warn and drop into the old code.  */
-bkpt_at_symbol:
+         linker.  Warn and drop into the old code.  */
+    bkpt_at_symbol:
       warning ("Unable to find dynamic linker breakpoint function.\nGDB will be unable to debug shared library initializers\nand track explicitly loaded dynamic code.");
     }
 #endif
@@ -1655,67 +1663,67 @@ bkpt_at_symbol:
   /* Nothing good happened.  */
   success = 0;
 
-#endif	/* BKPT_AT_SYMBOL */
+#endif /* BKPT_AT_SYMBOL */
 
-#endif	/* !SVR4_SHARED_LIBS */
+#endif /* !SVR4_SHARED_LIBS */
 
   return (success);
 }
-  
+
 /*
-  
-GLOBAL FUNCTION
-  
-	solib_create_inferior_hook -- shared library startup support
-  
-SYNOPSIS
-  
-	void 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 SunOS executables, this first instruction is typically the
-	one at "_start", or a similar text label, regardless of whether
-	the executable is statically or dynamically linked.  The runtime
-	startup code takes care of dynamically linking in any shared
-	libraries, once gdb allows the inferior to continue.
-
-	For SVR4 executables, this first instruction is either the first
-	instruction in the dynamic linker (for dynamically linked
-	executables) or the instruction at "start" for statically linked
-	executables.  For dynamically linked executables, the system
-	first exec's /lib/libc.so.N, which contains the dynamic linker,
-	and starts it running.  The dynamic linker maps in any needed
-	shared libraries, maps in the actual user executable, and then
-	jumps to "start" in the user executable.
-
-	For both SunOS shared libraries, and SVR4 shared libraries, we
-	can arrange to cooperate with the dynamic linker to discover the
-	names of shared libraries that are dynamically linked, and the
-	base addresses to which they are linked.
-
-	This function is responsible for discovering those names and
-	addresses, and saving sufficient information about them to allow
-	their symbols to be read at a later time.
-
-FIXME
-
-	Between enable_break() and disable_break(), this code does not
-	properly handle hitting breakpoints which the user might have
-	set in the startup code or in the dynamic linker itself.  Proper
-	handling will probably have to wait until the implementation is
-	changed to use the "breakpoint handler function" method.
-
-	Also, what if child has exit()ed?  Must exit loop somehow.
-  */
-
-void 
-solib_create_inferior_hook()
+
+   GLOBAL FUNCTION
+
+   solib_create_inferior_hook -- shared library startup support
+
+   SYNOPSIS
+
+   void 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 SunOS executables, this first instruction is typically the
+   one at "_start", or a similar text label, regardless of whether
+   the executable is statically or dynamically linked.  The runtime
+   startup code takes care of dynamically linking in any shared
+   libraries, once gdb allows the inferior to continue.
+
+   For SVR4 executables, this first instruction is either the first
+   instruction in the dynamic linker (for dynamically linked
+   executables) or the instruction at "start" for statically linked
+   executables.  For dynamically linked executables, the system
+   first exec's /lib/libc.so.N, which contains the dynamic linker,
+   and starts it running.  The dynamic linker maps in any needed
+   shared libraries, maps in the actual user executable, and then
+   jumps to "start" in the user executable.
+
+   For both SunOS shared libraries, and SVR4 shared libraries, we
+   can arrange to cooperate with the dynamic linker to discover the
+   names of shared libraries that are dynamically linked, and the
+   base addresses to which they are linked.
+
+   This function is responsible for discovering those names and
+   addresses, and saving sufficient information about them to allow
+   their symbols to be read at a later time.
+
+   FIXME
+
+   Between enable_break() and disable_break(), this code does not
+   properly handle hitting breakpoints which the user might have
+   set in the startup code or in the dynamic linker itself.  Proper
+   handling will probably have to wait until the implementation is
+   changed to use the "breakpoint handler function" method.
+
+   Also, what if child has exit()ed?  Must exit loop somehow.
+ */
+
+void
+solib_create_inferior_hook ()
 {
   /* If we are using the BKPT_AT_SYMBOL code, then we don't need the base
      yet.  In fact, in the case of a SunOS4 executable being run on
@@ -1781,30 +1789,30 @@ solib_create_inferior_hook()
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	special_symbol_handling -- additional shared library symbol handling
+   special_symbol_handling -- additional shared library symbol handling
 
-SYNOPSIS
+   SYNOPSIS
 
-	void special_symbol_handling (struct so_list *so)
+   void special_symbol_handling (struct so_list *so)
 
-DESCRIPTION
+   DESCRIPTION
 
-	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.
+   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.
 
-	For SunOS4, this consists of grunging around in the dynamic
-	linkers structures to find symbol definitions for "common" symbols
-	and adding them to the minimal symbol table for the runtime common
-	objfile.
+   For SunOS4, this consists of grunging around in the dynamic
+   linkers structures to find symbol definitions for "common" symbols
+   and adding them to the minimal symbol table for the runtime common
+   objfile.
 
-*/
+ */
 
 static void
 special_symbol_handling (so)
-struct so_list *so;
+     struct so_list *so;
 {
 #ifndef SVR4_SHARED_LIBS
   int j;
@@ -1823,7 +1831,7 @@ struct so_list *so;
 
       /* Calc address of debugger interface structure */
       /* FIXME, this needs work for cross-debugging of core files
-	 (byteorder, size, alignment, etc).  */
+         (byteorder, size, alignment, etc).  */
 
       debug_addr = (CORE_ADDR) dynamic_copy.ldd;
     }
@@ -1834,7 +1842,7 @@ struct so_list *so;
   j = target_read_memory (debug_addr, (char *) &debug_copy,
 			  sizeof (debug_copy));
   if (j)
-    return;		/* unreadable */
+    return;			/* unreadable */
 
   /* Get common symbol definitions for the loaded object. */
 
@@ -1843,28 +1851,28 @@ struct so_list *so;
       solib_add_common_symbols (debug_copy.ldd_cp);
     }
 
-#endif	/* !SVR4_SHARED_LIBS */
+#endif /* !SVR4_SHARED_LIBS */
 }
 
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	sharedlibrary_command -- handle command to explicitly add library
+   sharedlibrary_command -- handle command to explicitly add library
 
-SYNOPSIS
+   SYNOPSIS
 
-	static void sharedlibrary_command (char *args, int from_tty)
+   static void sharedlibrary_command (char *args, int from_tty)
 
-DESCRIPTION
+   DESCRIPTION
 
-*/
+ */
 
 static void
 sharedlibrary_command (args, from_tty)
-char *args;
-int from_tty;
+     char *args;
+     int from_tty;
 {
   dont_repeat ();
   solib_add (args, from_tty, (struct target_ops *) 0);
@@ -1873,13 +1881,13 @@ int from_tty;
 #endif /* HAVE_LINK_H */
 
 void
-_initialize_solib()
+_initialize_solib ()
 {
 #ifdef HAVE_LINK_H
 
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
 	   "Load shared object library symbols for files matching REGEXP.");
-  add_info ("sharedlibrary", info_sharedlibrary_command, 
+  add_info ("sharedlibrary", info_sharedlibrary_command,
 	    "Status of loaded shared object libraries.");
 
   add_show_from_set