* buildsym.h: Remove declaration of dbxread.c functions.

* stabsread.h: Group together dbxread.c functions.
	Move elfstab_build_psymtabs here from symfile.h.
	Declare pastab_build_psymtabs.
	* elfread.c, paread.c: Include stabsread.h (for stabsread_new_init
	declaration, etc).

gdb/ChangeLog

@@ -1,3 +1,12 @@
+Mon Aug 23 20:26:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* buildsym.h: Remove declaration of dbxread.c functions.
+	* stabsread.h: Group together dbxread.c functions.
+	Move elfstab_build_psymtabs here from symfile.h.
+	Declare pastab_build_psymtabs.
+	* elfread.c, paread.c: Include stabsread.h (for stabsread_new_init
+	declaration, etc).
+
 Mon Aug 23 17:16:23 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
 	* remote-bug.c: rename quiet to bug88k_snoop.

gdb/buildsym.h

@@ -251,18 +251,6 @@ record_line PARAMS ((struct subfile *, int, CORE_ADDR));
 extern void
 start_symtab PARAMS ((char *, char *, CORE_ADDR));
 
-extern struct partial_symtab *
-start_psymtab PARAMS ((struct objfile *, struct section_offsets *, char *,
-		       CORE_ADDR, int, struct partial_symbol *,
-		       struct partial_symbol *));
-
-extern void
-end_psymtab PARAMS ((struct partial_symtab *, char **, int, int, CORE_ADDR,
-		     struct partial_symtab **, int));
-
-extern void
-process_one_symbol PARAMS ((int, int, CORE_ADDR, char *,
-			    struct section_offsets *, struct objfile *));
 extern int
 hashname PARAMS ((char *));
 

gdb/elfread.c

@@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "objfiles.h"
 #include "buildsym.h"
+#include "stabsread.h"
 #include "gdb-stabs.h"
 #include "complaints.h"
 #include <string.h>

gdb/paread.c

@@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "objfiles.h"
 #include "buildsym.h"
+#include "stabsread.h"
 #include "gdb-stabs.h"
 #include "complaints.h"
 #include <string.h>

gdb/stabsread.h

@@ -154,6 +154,24 @@ add_undefined_type PARAMS ((struct type *));
 extern struct symbol *
 define_symbol PARAMS ((unsigned int, char *, int, int, struct objfile *));
 
+extern void
+stabsread_init PARAMS ((void));
+
+extern void
+stabsread_new_init PARAMS ((void));
+
+extern void
+start_stabs PARAMS ((void));
+
+extern void
+end_stabs PARAMS ((void));
+
+extern void
+finish_global_stabs PARAMS ((struct objfile *objfile));
+
+/* Functions exported by dbxread.c.  These are not in stabsread.h because
+   they are only used by some stabs readers.  */
+
 extern struct partial_symtab *
 start_psymtab PARAMS ((struct objfile *, struct section_offsets *, char *,
 		       CORE_ADDR, int, struct partial_symbol *,
@@ -168,18 +186,15 @@ process_one_symbol PARAMS ((int, int, CORE_ADDR, char *,
 			    struct section_offsets *, struct objfile *));
 
 extern void
-stabsread_init PARAMS ((void));
+elfstab_build_psymtabs PARAMS ((struct objfile *objfile,
+				struct section_offsets *section_offsets,
+				int mainline,
+				file_ptr staboff, unsigned int stabsize,
+				file_ptr stabstroffset,
+				unsigned int stabstrsize));
 
 extern void
-stabsread_new_init PARAMS ((void));
-
-extern void
-start_stabs PARAMS ((void));
-
-extern void
-end_stabs PARAMS ((void));
-
-extern void
-finish_global_stabs PARAMS ((struct objfile *objfile));
+pastab_build_psymtabs PARAMS ((struct objfile *, struct section_offsets *,
+			       int));
 
 #undef EXTERN