[binutils-gdb] Move some declarations to mdebugread.h

[Tom Tromey <tromey at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0e8f53badb3df16f4104890395d9324a5bcf568d

commit 0e8f53badb3df16f4104890395d9324a5bcf568d
Author: Tom Tromey <tom@tromey.com>
Date:   Thu May 10 16:23:43 2018 -0600

    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:
---
 gdb/ChangeLog    |  9 +++++++++
 gdb/elfread.c    |  1 +
 gdb/mdebugread.h |  9 +++++++++
 gdb/mipsread.c   |  1 +
 gdb/symfile.h    | 11 +----------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35c34d5..dc64607 100644
--- 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 9d35feb..bc6b5ff 100644
--- 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 bf1c19f..1b94ff8 100644
--- 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 3ee6db7..e54dc5d 100644
--- 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 8e548a0..64d5a23 100644
--- 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.  */