Makefile.in (toplev.o, [...]): Depend on debug.h, wrap long lines.

	* Makefile.in (toplev.o, sdbout.o, dbxout.o, dwarfout.o,
	dwarf2out.o): Depend on debug.h, wrap long lines.
	* dbxout.c: Include debug.h.
	(dbx_debug_hooks): New.
	(dbxout_init): Make static, take just 2 args.
	(dbxout_finish): Make static.
	* dbxout.h (dbxout_init, dbxout_finish): Delete.
	* debug.c: New file.
	* debug.h: New file.
	* dwarf2out.c: Include debug.h.
	(dwarf2_debug_hooks): New.
	(dwarf2out_init): Make static.
	(dwarf2out_finish): Make static, take 2 args.
	* dwarf2out.h (dwarf2out_init, dwarf2out_finish): Delete.
	* dwarfout.c: Include debug.h.
	(dwarf_debug_hooks): New.
	(dwarfout_init): Make static.
	(dwarfout_finish): Make static, take 2 args.
	* dwarfout.h (dwarfout_init, dwarfout_finish): Delete.
	* sdbout.c: Include debug.h.
	(sdb_debug_hooks): New.
	(sdbout_init): Make static, take 2 args.
	* sdbout.h (sdbout_init): Delete.
	* toplev.c: Include debug.h.
	(debug_hooks): New.
	(compile_file): Set deubg_hooks based on command line options.
	Use the hooks unconditionally rather than conditional compilation.

From-SVN: r43908

1 files changed, 14 insertions, 4 deletions

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index ee51fae..0dd135b 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -82,6 +82,7 @@ Boston, MA 02111-1307, USA.  */
 #include "toplev.h"
 #include "tm_p.h"
 #include "ggc.h"
+#include "debug.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 #include "xcoffout.h"
@@ -283,6 +284,8 @@ static int current_sym_nchars;
 #define CONTIN do { } while (0)
 #endif
 
+static void dbxout_init			PARAMS ((FILE *, const char *));
+static void dbxout_finish		PARAMS ((FILE *, const char *));
 #if defined(ASM_OUTPUT_SECTION_NAME)
 static void dbxout_function_end		PARAMS ((void));
 #endif
@@ -306,6 +309,13 @@ static void dbxout_finish_symbol	PARAMS ((tree));
 static void dbxout_block		PARAMS ((tree, int, tree));
 static void dbxout_really_begin_function PARAMS ((tree));
 
+/* The target debug structure.  */
+struct gcc_debug_hooks dbx_debug_hooks =
+{
+  dbxout_init,
+  dbxout_finish
+};
+
 #if defined(ASM_OUTPUT_SECTION_NAME)
 static void
 dbxout_function_end ()
@@ -332,13 +342,13 @@ dbxout_function_end ()
 /* At the beginning of compilation, start writing the symbol table.
    Initialize `typevec' and output the standard data types of C.  */
 
-void
-dbxout_init (asm_file, input_file_name, syms)
+static void
+dbxout_init (asm_file, input_file_name)
      FILE *asm_file;
      const char *input_file_name;
-     tree syms;
 {
   char ltext_label_name[100];
+  tree syms = getdecls ();
 
   asmfile = asm_file;
 
@@ -535,7 +545,7 @@ dbxout_source_line (file, filename, lineno)
    Unless you define DBX_OUTPUT_MAIN_SOURCE_FILE_END, the default is
    to do nothing.  */
 
-void
+static void
 dbxout_finish (file, filename)
      FILE *file ATTRIBUTE_UNUSED;
      const char *filename ATTRIBUTE_UNUSED;