Move some declarations to mdebugread.h

This moves a couple of mdebugread-related declarations from symfile.h
to mdebugread.h, which seemed more appropriate.

gdb/ChangeLog
2019-01-10  Tom Tromey  <tom@tromey.com>

	* symfile.h (mdebug_build_psymtabs, elfmdebug_build_psymtabs):
	Don't declare.
	* mipsread.c: Include mdebugread.h.
	* mdebugread.h (mdebug_build_psymtabs, elfmdebug_build_psymtabs):
	Declare.
	* elfread.c: Include mdebugread.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35c34d569126c7676aaa97ba3856afa49a351659..dc646070cc12199a52c502a79aa7e602af91e1e0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2019-01-10  Tom Tromey  <tom@tromey.com>
+
+       * symfile.h (mdebug_build_psymtabs, elfmdebug_build_psymtabs):
+       Don't declare.
+       * mipsread.c: Include mdebugread.h.
+       * mdebugread.h (mdebug_build_psymtabs, elfmdebug_build_psymtabs):
+       Declare.
+       * elfread.c: Include mdebugread.h.
+
 2019-01-09  Tom Tromey  <tom@tromey.com>
 
        * dbxread.c (dbx_end_psymtab): Use objfile_psymtabs.

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 9d35febc2f97ec79594442c4f8ab8d2ac9dfb11c..bc6b5ff69bd1fd494cea627a1b8341f5180da413 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -47,6 +47,7 @@
 #include "build-id.h"
 #include "location.h"
 #include "auxv.h"
+#include "mdebugread.h"
 
 /* Forward declarations.  */
 extern const struct sym_fns elf_sym_fns_gdb_index;

diff --git a/gdb/mdebugread.h b/gdb/mdebugread.h
index bf1c19f2e05417214d6af588ff82633fd7abc760..1b94ff8ee65cd76119708857341b28e26472001b 100644 (file)
--- a/gdb/mdebugread.h
+++ b/gdb/mdebugread.h
@@ -37,4 +37,13 @@ struct mdebug_extra_func_info
 
 #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
 
+extern void mdebug_build_psymtabs (minimal_symbol_reader &,
+                                  struct objfile *,
+                                  const struct ecoff_debug_swap *,
+                                  struct ecoff_debug_info *);
+
+extern void elfmdebug_build_psymtabs (struct objfile *,
+                                     const struct ecoff_debug_swap *,
+                                     asection *);
+
 #endif /* MDEBUGREAD_H */

diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 3ee6db7364cb28e96f6d8ce4653aaf701aef94b1..e54dc5de45a129e0bd9ed952bb61b365dc1e1484 100644 (file)
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -28,6 +28,7 @@
 #include "symtab.h"
 #include "objfiles.h"
 #include "stabsread.h"
+#include "mdebugread.h"
 
 #include "coff/sym.h"
 #include "coff/internal.h"

diff --git a/gdb/symfile.h b/gdb/symfile.h
index 8e548a0565c60f6ee008ef2457f7ebc10644d2ce..64d5a23f9b2af8db3302e204bae33abb791bcd80 100644 (file)
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -610,16 +610,7 @@ extern bool dwarf2_initialize_objfile (struct objfile *objfile,
 extern void dwarf2_build_psymtabs (struct objfile *);
 extern void dwarf2_build_frame_info (struct objfile *);
 
-/* From mdebugread.c */
-
-extern void mdebug_build_psymtabs (minimal_symbol_reader &,
-                                  struct objfile *,
-                                  const struct ecoff_debug_swap *,
-                                  struct ecoff_debug_info *);
-
-extern void elfmdebug_build_psymtabs (struct objfile *,
-                                     const struct ecoff_debug_swap *,
-                                     asection *);
+void dwarf2_free_objfile (struct objfile *);
 
 /* From minidebug.c.  */