X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsomread.c;h=ed0fe976997ba187bddd7b980c4b36b7e46348ba;hb=8ed44d196817ad04f542d03d40908d2f1ae375fc;hp=ab8d531cc275354b1e58ad8d0da887dd5fdfda12;hpb=436d4143274d6bb3c32632f7ae1bd82cda5128b5;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/somread.c b/gdb/somread.c
index ab8d531cc2..ed0fe97699 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "bfd.h"
-#include "som.h"
-#include "libhppa.h"
 #include <syms.h>
 #include "symtab.h"
 #include "symfile.h"
@@ -32,7 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "complaints.h"
 #include "gdb_string.h"
 #include "demangle.h"
-#include <sys/file.h>
+#include "som.h"
+#include "libhppa.h"
 
 /* Various things we might complain about... */
 
@@ -55,21 +54,16 @@ som_symtab_read PARAMS ((bfd *, struct objfile *,
 static struct section_offsets *
 som_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR));
 
-static void
-record_minimal_symbol PARAMS ((char *, CORE_ADDR,
-			       enum minimal_symbol_type,
-			       struct objfile *));
+/* FIXME: These should really be in a common header somewhere */
 
-static void
-record_minimal_symbol (name, address, ms_type, objfile)
-     char *name;
-     CORE_ADDR address;
-     enum minimal_symbol_type ms_type;
-     struct objfile *objfile;
-{
-  name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
-  prim_record_minimal_symbol (name, address, ms_type, objfile);
-}
+extern void
+hpread_build_psymtabs PARAMS ((struct objfile *, struct section_offsets *, int));
+
+extern void
+hpread_symfile_finish PARAMS ((struct objfile *));
+
+extern void
+hpread_symfile_init PARAMS ((struct objfile *));
 
 /*
 
@@ -288,11 +282,15 @@ som_symtab_read (abfd, objfile, section_offsets)
 
 	/* This can happen for common symbols when -E is passed to the
 	   final link.  No idea _why_ that would make the linker force
-	   common symbols to have an SS_UNSAT scope, but it does.  */
+	   common symbols to have an SS_UNSAT scope, but it does.
+
+	   This also happens for weak symbols, but their type is
+	   ST_DATA.  */
 	case SS_UNSAT:
 	  switch (bufp->symbol_type)
 	    {
 	      case ST_STORAGE:
+	      case ST_DATA:
 		symname = bufp->name.n_strx + stringtab;
 		bufp->symbol_value += data_offset;
 		ms_type = mst_data;
@@ -311,9 +309,8 @@ som_symtab_read (abfd, objfile, section_offsets)
 	error ("Invalid symbol data; bad HP string table offset: %d",
 	       bufp->name.n_strx);
 
-      record_minimal_symbol (symname,
-			     bufp->symbol_value, ms_type, 
-			     objfile);
+      prim_record_minimal_symbol (symname, bufp->symbol_value, ms_type, 
+				  objfile);
     }
 }
 
@@ -435,9 +432,7 @@ som_symfile_offsets (objfile, addr)
 
   objfile->num_sections = SECT_OFF_MAX;
   section_offsets = (struct section_offsets *)
-    obstack_alloc (&objfile -> psymbol_obstack,
-		   sizeof (struct section_offsets)
-		   + sizeof (section_offsets->offsets) * (SECT_OFF_MAX-1));
+    obstack_alloc (&objfile -> psymbol_obstack, SIZEOF_SECTION_OFFSETS);
 
   /* First see if we're a shared library.  If so, get the section
      offsets from the library, else get them from addr.  */