Patch from Jeff Law:

* paread.c: Fix references to "hppa" that should now be "som".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b120d26b43abe97750c16ee95a3158d21b10ada6..c51fee7a80cba3b01af390f47f060cf9898ce8ad 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 21 12:05:08 1993  Ken Raeburn  (raeburn@cygnus.com)
+
+       Patch from Jeff Law:
+       * paread.c: Fix references to "hppa" that should now be "som".
+
 Thu Oct 21 12:23:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * symtab.c (decode_line_1): Don't use SYMBOL_LINE for functions.

diff --git a/gdb/paread.c b/gdb/paread.c
index d21aa54d26d9fd1277279d1550cf2f476eafe067..c79ddb538b59756d57205d3337ee33cfc45e160f 100644 (file)
--- a/gdb/paread.c
+++ b/gdb/paread.c
@@ -24,6 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/types.h> /* For time_t, if not in time.h.  */
 #include "libbfd.h"
 #include "som.h"
+#include "libhppa.h"
 #include <syms.h>
 #include "symtab.h"
 #include "symfile.h"
@@ -119,15 +120,15 @@ pa_symtab_read (abfd, addr, objfile)
   number_of_symbols = bfd_get_symcount (abfd);
 
   buf = alloca (symsize * number_of_symbols);
-  bfd_seek (abfd, obj_sym_filepos (abfd), L_SET);
+  bfd_seek (abfd, obj_som_sym_filepos (abfd), L_SET);
   val = bfd_read (buf, symsize * number_of_symbols, 1, abfd);
   if (val != symsize * number_of_symbols)
     error ("Couldn't read symbol dictionary!");
 
-  stringtab = alloca (obj_stringtab_size (abfd));
-  bfd_seek (abfd, obj_str_filepos (abfd), L_SET);
-  val = bfd_read (stringtab, obj_stringtab_size (abfd), 1, abfd);
-  if (val != obj_stringtab_size (abfd))
+  stringtab = alloca (obj_som_stringtab_size (abfd));
+  bfd_seek (abfd, obj_som_str_filepos (abfd), L_SET);
+  val = bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, abfd);
+  if (val != obj_som_stringtab_size (abfd))
     error ("Can't read in HP string table.");
 
   endbufp = buf + number_of_symbols;
@@ -214,7 +215,7 @@ pa_symtab_read (abfd, addr, objfile)
          continue;
        }
 
-      if (bufp->name.n_strx > obj_stringtab_size (abfd))
+      if (bufp->name.n_strx > obj_som_stringtab_size (abfd))
        error ("Invalid symbol data; bad HP string table offset: %d",
               bufp->name.n_strx);
 
@@ -504,8 +505,8 @@ pa_symfile_offsets (objfile, addr)
    file format name with an -hppa suffix?  */
 static struct sym_fns pa_sym_fns =
 {
-  "hppa",              /* sym_name: name or name prefix of BFD target type */
-  4,                   /* sym_namelen: number of significant sym_name chars */
+  "som",               /* sym_name: name or name prefix of BFD target type */
+  3,                   /* sym_namelen: number of significant sym_name chars */
   pa_new_init,         /* sym_new_init: init anything gbl to entire symtab */
   pa_symfile_init,     /* sym_init: read initial info, setup for sym_read() */
   pa_symfile_read,     /* sym_read: read a symbol file into symtab */