2004-10-30 Andrew Cagney <cagney@gnu.org>

	* objfiles.c: Include "mdebugread.h".
	* mdebugread.c: Include "mdebugread.h".
	(ecoff_relocate_cfi): Delete.
	* config/alpha/tm-alpha.h (ecoff_relcate_cfi): Delete.
	* config/mips/tm-mips.h (ecoff_relcate_cfi): Delete.
	* mdebugread.h (ecoff_relocate_efi): New file.
	* Makefile.in: Update dependencies.

7 files changed, 43 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d28505..602ad2f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2004-10-30  Andrew Cagney  <cagney@gnu.org>
 
+	* objfiles.c: Include "mdebugread.h".
+	* mdebugread.c: Include "mdebugread.h".
+	(ecoff_relocate_cfi): Delete.
+	* config/alpha/tm-alpha.h (ecoff_relcate_cfi): Delete.
+	* config/mips/tm-mips.h (ecoff_relcate_cfi): Delete.
+	* mdebugread.h (ecoff_relocate_efi): New file.
+	* Makefile.in: Update dependencies.
+	
 	* mips-tdep.c (struct frame_extra_info): Delete.
 	(temp_proc_desc): Delete.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 22e44c7..3fbe255 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -727,6 +727,7 @@ macroexp_h = macroexp.h
 macroscope_h = macroscope.h $(macrotab_h) $(symtab_h)
 macrotab_h = macrotab.h
 main_h = main.h
+mdebugread_h = mdebugread.h
 memattr_h = memattr.h
 mips_mdebug_tdep_h = mips-mdebug-tdep.h
 mipsnbsd_tdep_h = mipsnbsd-tdep.h
@@ -2221,8 +2222,8 @@ mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
 mdebugread.o: mdebugread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \
 	$(objfiles_h) $(gdb_obstack_h) $(buildsym_h) $(stabsread_h) \
 	$(complaints_h) $(demangle_h) $(gdb_assert_h) $(block_h) \
-	$(dictionary_h) $(coff_sym_h) $(coff_symconst_h) $(gdb_stat_h) \
-	$(gdb_string_h) $(bfd_h) $(coff_ecoff_h) $(libaout_h) \
+	$(dictionary_h) $(mdebugread_h) $(coff_sym_h) $(coff_symconst_h) \
+	$(gdb_stat_h) $(gdb_string_h) $(bfd_h) $(coff_ecoff_h) $(libaout_h) \
 	$(aout_aout64_h) $(aout_stab_gnu_h) $(expression_h)
 memattr.o: memattr.c $(defs_h) $(command_h) $(gdbcmd_h) $(memattr_h) \
 	$(target_h) $(value_h) $(language_h) $(gdb_string_h)
@@ -2297,9 +2298,9 @@ objc-lang.o: objc-lang.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \
 	$(gdb_regex_h) $(regcache_h) $(block_h) $(infcall_h) $(valprint_h) \
 	$(gdb_assert_h)
 objfiles.o: objfiles.c $(defs_h) $(bfd_h) $(symtab_h) $(symfile_h) \
-	$(objfiles_h) $(gdb_stabs_h) $(target_h) $(bcache_h) $(gdb_assert_h) \
-	$(gdb_stat_h) $(gdb_obstack_h) $(gdb_string_h) $(hashtab_h) \
-	$(breakpoint_h) $(block_h) $(dictionary_h)
+	$(objfiles_h) $(gdb_stabs_h) $(target_h) $(bcache_h) $(mdebugread_h) \
+	$(gdb_assert_h) $(gdb_stat_h) $(gdb_obstack_h) $(gdb_string_h) \
+	$(hashtab_h) $(breakpoint_h) $(block_h) $(dictionary_h)
 observer.o: observer.c $(defs_h) $(observer_h) $(command_h) $(gdbcmd_h) \
 	$(observer_inc)
 ocd.o: ocd.c $(defs_h) $(gdbcore_h) $(gdb_string_h) $(frame_h) $(inferior_h) \
diff --git a/gdb/config/alpha/tm-alpha.h b/gdb/config/alpha/tm-alpha.h
index c481ec2..fcf90de 100644
--- a/gdb/config/alpha/tm-alpha.h
+++ b/gdb/config/alpha/tm-alpha.h
@@ -35,7 +35,6 @@ struct symbol;
    alpha_extra_func_info_t's off of this.  */
 
 #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
-extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR);
 
 #define RA_REGNUM 26		/* XXXJRT needed by mdebugread.c */
 
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index fb73bf5..2f2ab9d 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -49,7 +49,6 @@ extern int mips_step_skips_delay (CORE_ADDR);
    hang mdebug_extra_func_info's off of this.  */
 
 #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
-extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR);
 
 /* Specific information about a procedure.
    This overlays the MIPS's PDR records, 
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index a930dbe..009430c 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -56,13 +56,13 @@
 #include "gdb_assert.h"
 #include "block.h"
 #include "dictionary.h"
+#include "mdebugread.h"
 
 /* These are needed if the tm.h file does not contain the necessary
    mips specific definitions.  */
 
 #ifndef MDEBUG_EFI_SYMBOL_NAME
 #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
-extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR);
 #include "coff/sym.h"
 #include "coff/symconst.h"
 struct mdebug_extra_func_info
diff --git a/gdb/mdebugread.h b/gdb/mdebugread.h
new file mode 100644
index 0000000..e1a5d1a
--- /dev/null
+++ b/gdb/mdebugread.h
@@ -0,0 +1,27 @@
+/* Read a symbol table in ECOFF format (Third-Eye).
+
+   Copyright 2004 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef MDEBUGREAD_H
+#define MDEBUGREAD_H
+
+extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR);
+
+#endif /* MDEBUGREAD_H */
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index a4aa652..9528d58 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -33,7 +33,7 @@
 #include "gdb-stabs.h"
 #include "target.h"
 #include "bcache.h"
-
+#include "mdebugread.h"
 #include "gdb_assert.h"
 #include <sys/types.h>
 #include "gdb_stat.h"